diff options
Diffstat (limited to 'gyp/common_conditions.gypi')
| -rw-r--r-- | gyp/common_conditions.gypi | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index cfc6d32edc..5965927660 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -191,6 +191,26 @@ '-Wno-invalid-offsetof', # GCC <4.6 is old-school strict about what is POD. ], 'conditions': [ + [ 'skia_os != "chromeos"', { + 'conditions': [ + [ 'skia_arch_width == 64 and skia_arch_type == "x86"', { + 'cflags': [ + '-m64', + ], + 'ldflags': [ + '-m64', + ], + }], + [ 'skia_arch_width == 32 and skia_arch_type == "x86"', { + 'cflags': [ + '-m32', + ], + 'ldflags': [ + '-m32', + ], + }], + ], + }], [ 'skia_android_framework==0', { 'cflags': [ # This flag is not supported by Android build system. @@ -422,26 +442,6 @@ ], }, }], - [ 'skia_os != "chromeos"', { - 'conditions': [ - [ 'skia_arch_width == 64 and skia_arch_type == "x86"', { - 'cflags': [ - '-m64', - ], - 'ldflags': [ - '-m64', - ], - }], - [ 'skia_arch_width == 32 and skia_arch_type == "x86"', { - 'cflags': [ - '-m32', - ], - 'ldflags': [ - '-m32', - ], - }], - ], - }], # Enable asan, tsan, etc. [ 'skia_sanitizer', { 'cflags': [ |