diff options
| author |  qiankun.miao <qiankun.miao@intel.com> | 2014-07-07 09:47:24 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-07-07 09:47:24 -0700 |
| commit | d312a04ffacb8e86a2d2eb37985b154ab4e9d3c6 (patch) | |
| tree | 5175b8b5f092731bdcba4fc65d38ce9f7148d294 /gyp | |
| parent | 0b7813b8c539bd88f38583cefcba9e3c9fdcbc87 (diff) | |
Enable 32/64-bit gyp switch on Android
Select 32/64-bit Skia build according skia_arch_width on Android.
BUG=skia:
R=djsollen@google.com, mtklein@google.com
Author: qiankun.miao@intel.com
Review URL: https://codereview.chromium.org/369813003
Diffstat (limited to 'gyp')
| -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': [ |