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

Side by Side Diff: gyp/common_conditions.gypi

Issue 746043002: Small changes to get things building and running on Linux/ARM. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 1 month 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 | « no previous file | tests/GrBinHashKeyTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # conditions used in both common.gypi and skia.gyp in chromium 1 # conditions used in both common.gypi and skia.gyp in chromium
2 # 2 #
3 { 3 {
4 'defines': [ 4 'defines': [
5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', 5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
6 'SK_SUPPORT_GPU=<(skia_gpu)', 6 'SK_SUPPORT_GPU=<(skia_gpu)',
7 'SK_SUPPORT_OPENCL=<(skia_opencl)', 7 'SK_SUPPORT_OPENCL=<(skia_opencl)',
8 'SK_FORCE_DISTANCE_FIELD_TEXT=<(skia_force_distance_field_text)', 8 'SK_FORCE_DISTANCE_FIELD_TEXT=<(skia_force_distance_field_text)',
9 ], 9 ],
10 'conditions' : [ 10 'conditions' : [
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 ], 291 ],
292 'cflags': [ 292 'cflags': [
293 '-mfpu=neon', 293 '-mfpu=neon',
294 ], 294 ],
295 }], 295 }],
296 [ 'arm_neon_optional == 1', { 296 [ 'arm_neon_optional == 1', {
297 'defines': [ 297 'defines': [
298 'SK_ARM_HAS_OPTIONAL_NEON', 298 'SK_ARM_HAS_OPTIONAL_NEON',
299 ], 299 ],
300 }], 300 }],
301 [ 'skia_os != "chromeos"', { 301 [ 'skia_os != "chromeos" and skia_os != "linux"', {
302 'cflags': [ 302 'cflags': [
303 '-mfloat-abi=softfp', 303 '-mfloat-abi=softfp',
304 ], 304 ],
305 }], 305 }],
306 ], 306 ],
307 }], 307 }],
308 [ 'skia_arch_type == "mips"', { 308 [ 'skia_arch_type == "mips"', {
309 'cflags': [ 309 'cflags': [
310 '-EL', 310 '-EL',
311 ], 311 ],
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 [ 'skia_is_bot', { 649 [ 'skia_is_bot', {
650 'defines': [ 'SK_CRASH_HANDLER' ], 650 'defines': [ 'SK_CRASH_HANDLER' ],
651 }], 651 }],
652 652
653 ], # end 'conditions' 653 ], # end 'conditions'
654 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 654 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
655 'xcode_settings': { 655 'xcode_settings': {
656 'SYMROOT': '<(DEPTH)/xcodebuild', 656 'SYMROOT': '<(DEPTH)/xcodebuild',
657 }, 657 },
658 } 658 }
OLDNEW
« no previous file with comments | « no previous file | tests/GrBinHashKeyTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698