Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(215)

Side by Side Diff: gyp/common_variables.gypi

Issue 1243383002: Add skia_use_android_framework_defines GYP_DEFINE (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Address comments Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « gyp/common_conditions.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 'skia_android_framework%': '<(skia_android_framework)', 69 'skia_android_framework%': '<(skia_android_framework)',
70 'skia_arch_type%': '<(skia_arch_type)', 70 'skia_arch_type%': '<(skia_arch_type)',
71 'arm_version%': '<(arm_version)', 71 'arm_version%': '<(arm_version)',
72 'arm_neon%': '<(arm_neon)', 72 'arm_neon%': '<(arm_neon)',
73 'skia_egl%': '<(skia_egl)', 73 'skia_egl%': '<(skia_egl)',
74 74
75 'conditions': [ 75 'conditions': [
76 [ 'skia_android_framework == 1', { 76 [ 'skia_android_framework == 1', {
77 'skia_os%': 'android', 77 'skia_os%': 'android',
78 'skia_chrome_utils%': 0, 78 'skia_chrome_utils%': 0,
79 'skia_use_android_framework_defines%': 1,
79 'skia_use_system_json%': 1, 80 'skia_use_system_json%': 1,
80 }, { 81 }, {
81 'skia_os%': '<(skia_os)', 82 'skia_os%': '<(skia_os)',
82 'skia_chrome_utils%': 1, 83 'skia_chrome_utils%': 1,
84 'skia_use_android_framework_defines%': 0,
83 'skia_use_system_json%': 0, 85 'skia_use_system_json%': 0,
84 }], 86 }],
85 [ 'skia_os == "win"', { 87 [ 'skia_os == "win"', {
86 'os_posix%': 0, 88 'os_posix%': 0,
87 }, { 89 }, {
88 'os_posix%': 1, 90 'os_posix%': 1,
89 }], 91 }],
90 ['"64" in skia_arch_type', { 92 ['"64" in skia_arch_type', {
91 'skia_arch_width%': 64, 93 'skia_arch_width%': 64,
92 }, { 94 }, {
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 192
191 'skia_freetype_static%': '<(skia_freetype_static)', 193 'skia_freetype_static%': '<(skia_freetype_static)',
192 'skia_no_fontconfig%': '<(skia_no_fontconfig)', 194 'skia_no_fontconfig%': '<(skia_no_fontconfig)',
193 'skia_embedded_fonts%': '<(skia_embedded_fonts)', 195 'skia_embedded_fonts%': '<(skia_embedded_fonts)',
194 'skia_sanitizer%': '<(skia_sanitizer)', 196 'skia_sanitizer%': '<(skia_sanitizer)',
195 'skia_scalar%': '<(skia_scalar)', 197 'skia_scalar%': '<(skia_scalar)',
196 'skia_mesa%': '<(skia_mesa)', 198 'skia_mesa%': '<(skia_mesa)',
197 'skia_gpu_extra_dependency_path%': '<(skia_gpu_extra_dependency_path)', 199 'skia_gpu_extra_dependency_path%': '<(skia_gpu_extra_dependency_path)',
198 'skia_stroke_path_rendering%': '<(skia_stroke_path_rendering)', 200 'skia_stroke_path_rendering%': '<(skia_stroke_path_rendering)',
199 'skia_android_framework%': '<(skia_android_framework)', 201 'skia_android_framework%': '<(skia_android_framework)',
202 'skia_use_android_framework_defines%': '<(skia_use_android_framework_defines )',
200 'skia_use_system_json%': '<(skia_use_system_json)', 203 'skia_use_system_json%': '<(skia_use_system_json)',
201 'skia_android_path_rendering%': '<(skia_android_path_rendering)', 204 'skia_android_path_rendering%': '<(skia_android_path_rendering)',
202 'skia_resource_cache_mb_limit%': '<(skia_resource_cache_mb_limit)', 205 'skia_resource_cache_mb_limit%': '<(skia_resource_cache_mb_limit)',
203 'skia_resource_cache_count_limit%': '<(skia_resource_cache_count_limit)', 206 'skia_resource_cache_count_limit%': '<(skia_resource_cache_count_limit)',
204 'skia_angle%': '<(skia_angle)', 207 'skia_angle%': '<(skia_angle)',
205 'skia_arch_width%': '<(skia_arch_width)', 208 'skia_arch_width%': '<(skia_arch_width)',
206 'skia_arch_type%': '<(skia_arch_type)', 209 'skia_arch_type%': '<(skia_arch_type)',
207 'skia_chrome_utils%': '<(skia_chrome_utils)', 210 'skia_chrome_utils%': '<(skia_chrome_utils)',
208 'skia_gdi%': '<(skia_gdi)', 211 'skia_gdi%': '<(skia_gdi)',
209 'skia_gpu%': '<(skia_gpu)', 212 'skia_gpu%': '<(skia_gpu)',
(...skipping 21 matching lines...) Expand all
231 '-ffast-math', # Optimize float math even when it breaks IEEE compliance. 234 '-ffast-math', # Optimize float math even when it breaks IEEE compliance.
232 #'-flto' # Enable link-time optimization. 235 #'-flto' # Enable link-time optimization.
233 ], 236 ],
234 237
235 # These are referenced by our .gypi files that list files (e.g. core.gypi) 238 # These are referenced by our .gypi files that list files (e.g. core.gypi)
236 # 239 #
237 'skia_src_path%': '../src', 240 'skia_src_path%': '../src',
238 'skia_include_path%': '../include', 241 'skia_include_path%': '../include',
239 }, 242 },
240 } 243 }
OLDNEW
« no previous file with comments | « gyp/common_conditions.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698