OLD | NEW |
---|---|
1 # Copyright 2012 The Android Open Source Project | 1 # Copyright 2012 The Android Open Source Project |
2 # | 2 # |
3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
5 | 5 |
6 { | 6 { |
7 # Get ready for the ugly... | 7 # Get ready for the ugly... |
8 # | 8 # |
9 # - We have to nest our variables dictionaries multiple levels deep, so that | 9 # - We have to nest our variables dictionaries multiple levels deep, so that |
10 # this and other gyp files can rely on previously-set variable values in | 10 # this and other gyp files can rely on previously-set variable values in |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
71 'skia_arch_type%': 'arm', | 71 'skia_arch_type%': 'arm', |
72 'arm_version%': 7, | 72 'arm_version%': 7, |
73 'arm_neon%': 0, # neon asm files known not to work with the ios build | 73 'arm_neon%': 0, # neon asm files known not to work with the ios build |
74 },{ # skia_os is not ios | 74 },{ # skia_os is not ios |
75 'skia_arch_type%': 'x86', | 75 'skia_arch_type%': 'x86', |
76 'arm_version%': 0, | 76 'arm_version%': 0, |
77 'arm_neon%': 0, | 77 'arm_neon%': 0, |
78 }], | 78 }], |
79 ], | 79 ], |
80 | 80 |
81 'skia_asan_build%': 0, | |
81 'skia_scalar%': 'float', | 82 'skia_scalar%': 'float', |
82 'skia_mesa%': 0, | 83 'skia_mesa%': 0, |
83 'skia_nv_path_rendering%': 0, | 84 'skia_nv_path_rendering%': 0, |
84 'skia_stroke_path_rendering%': 0, | 85 'skia_stroke_path_rendering%': 0, |
85 'skia_android_path_rendering%': 0, | 86 'skia_android_path_rendering%': 0, |
86 'skia_texture_cache_mb_limit%': 0, | 87 'skia_texture_cache_mb_limit%': 0, |
87 'skia_angle%': 0, | 88 'skia_angle%': 0, |
88 'skia_directwrite%': 0, | 89 'skia_directwrite%': 0, |
89 'skia_gpu%': 1, | 90 'skia_gpu%': 1, |
90 'skia_osx_sdkroot%': '', | 91 'skia_osx_sdkroot%': '', |
(...skipping 19 matching lines...) Expand all Loading... | |
110 | 111 |
111 # This variable allows the user to customize the optimization level used | 112 # This variable allows the user to customize the optimization level used |
112 # by the compiler. The user should be aware that this has different | 113 # by the compiler. The user should be aware that this has different |
113 # meanings for different compilers and should exercise caution when | 114 # meanings for different compilers and should exercise caution when |
114 # overriding it. | 115 # overriding it. |
115 [ 'skia_os == "win"', { | 116 [ 'skia_os == "win"', { |
116 'skia_release_optimization_level%': '<(skia_default_vs_optimization_leve l)', | 117 'skia_release_optimization_level%': '<(skia_default_vs_optimization_leve l)', |
117 }, { | 118 }, { |
118 'skia_release_optimization_level%': '<(skia_default_gcc_optimization_lev el)', | 119 'skia_release_optimization_level%': '<(skia_default_gcc_optimization_lev el)', |
119 }], | 120 }], |
121 [ 'skia_asan_build', { | |
122 'skia_clang_build': 1, | |
123 }, { | |
robertphillips
2013/08/21 14:12:51
Should this % be here and not above?
borenet
2013/08/21 14:16:01
Building with ASAN implies that we're using Clang,
| |
124 'skia_clang_build%': 0, | |
125 }], | |
120 ], | 126 ], |
121 | 127 |
122 # Re-define all variables defined within the level-2 'variables' dict, | 128 # Re-define all variables defined within the level-2 'variables' dict, |
123 # so that siblings of the level-1 'variables' dict can see them. | 129 # so that siblings of the level-1 'variables' dict can see them. |
124 'arm_version%': '<(arm_version)', | 130 'arm_version%': '<(arm_version)', |
125 'arm_neon%': '<(arm_neon)', | 131 'arm_neon%': '<(arm_neon)', |
126 'arm_neon_optional%': 0, | 132 'arm_neon_optional%': 0, |
127 'skia_os%': '<(skia_os)', | 133 'skia_os%': '<(skia_os)', |
128 'os_posix%': '<(os_posix)', | 134 'os_posix%': '<(os_posix)', |
135 'skia_asan_build%': '<(skia_asan_build)', | |
djsollen
2013/08/21 14:09:37
don't you need to define skia_clang_build here as
borenet
2013/08/21 14:16:01
No, since skia_clang_build is already defined at t
| |
129 'skia_scalar%': '<(skia_scalar)', | 136 'skia_scalar%': '<(skia_scalar)', |
130 'skia_mesa%': '<(skia_mesa)', | 137 'skia_mesa%': '<(skia_mesa)', |
131 'skia_nv_path_rendering%': '<(skia_nv_path_rendering)', | 138 'skia_nv_path_rendering%': '<(skia_nv_path_rendering)', |
132 'skia_stroke_path_rendering%': '<(skia_stroke_path_rendering)', | 139 'skia_stroke_path_rendering%': '<(skia_stroke_path_rendering)', |
133 'skia_android_path_rendering%': '<(skia_android_path_rendering)', | 140 'skia_android_path_rendering%': '<(skia_android_path_rendering)', |
134 'skia_texture_cache_mb_limit%': '<(skia_texture_cache_mb_limit)', | 141 'skia_texture_cache_mb_limit%': '<(skia_texture_cache_mb_limit)', |
135 'skia_angle%': '<(skia_angle)', | 142 'skia_angle%': '<(skia_angle)', |
136 'skia_arch_width%': '<(skia_arch_width)', | 143 'skia_arch_width%': '<(skia_arch_width)', |
137 'skia_arch_type%': '<(skia_arch_type)', | 144 'skia_arch_type%': '<(skia_arch_type)', |
138 'skia_directwrite%': '<(skia_directwrite)', | 145 'skia_directwrite%': '<(skia_directwrite)', |
139 'skia_gpu%': '<(skia_gpu)', | 146 'skia_gpu%': '<(skia_gpu)', |
140 'skia_win_exceptions%': 0, | 147 'skia_win_exceptions%': 0, |
141 'skia_osx_sdkroot%': '<(skia_osx_sdkroot)', | 148 'skia_osx_sdkroot%': '<(skia_osx_sdkroot)', |
142 'skia_profile_enabled%': '<(skia_profile_enabled)', | 149 'skia_profile_enabled%': '<(skia_profile_enabled)', |
143 'skia_shared_lib%': '<(skia_shared_lib)', | 150 'skia_shared_lib%': '<(skia_shared_lib)', |
144 'skia_opencl%': '<(skia_opencl)', | 151 'skia_opencl%': '<(skia_opencl)', |
145 'skia_static_initializers%': '<(skia_static_initializers)', | 152 'skia_static_initializers%': '<(skia_static_initializers)', |
146 'ios_sdk_version%': '6.0', | 153 'ios_sdk_version%': '6.0', |
147 'skia_win_debuggers_path%': '<(skia_win_debuggers_path)', | 154 'skia_win_debuggers_path%': '<(skia_win_debuggers_path)', |
148 'skia_asan_build%': 0, | |
149 | 155 |
150 # These are referenced by our .gypi files that list files (e.g. core.gypi) | 156 # These are referenced by our .gypi files that list files (e.g. core.gypi) |
151 # | 157 # |
152 'skia_src_path%': '../src', | 158 'skia_src_path%': '../src', |
153 'skia_include_path%': '../include', | 159 'skia_include_path%': '../include', |
154 }, | 160 }, |
155 } | 161 } |
156 # Local Variables: | 162 # Local Variables: |
157 # tab-width:2 | 163 # tab-width:2 |
158 # indent-tabs-mode:nil | 164 # indent-tabs-mode:nil |
159 # End: | 165 # End: |
160 # vim: set expandtab tabstop=2 shiftwidth=2: | 166 # vim: set expandtab tabstop=2 shiftwidth=2: |
OLD | NEW |