diff options
| author |  scroggo <scroggo@google.com> | 2015-02-12 10:48:25 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-02-12 10:48:25 -0800 |
| commit | df1c3373fc198f465cb0077516993dd41f268416 (patch) | |
| tree | 5df85329712ed32721983b72a8db3f1e474899c6 /platform_tools/android/gyp | |
| parent | 9d7ceca35064b71e13e498da7e641e69b97bf4cf (diff) | |
Don't use m32 cflag for x86_64.
When checking the skia_arch_type for "x86", instead of doing an
== compare, check if "x86" in skia_arch_type, so it will cover
both x86 and x86_64.
Except when we specifically want x86.
Set skia_arch_width based on "64" in skia_arch_type. No need to specify
in scripts.
In gyp_to_android.py, create a separate var_dict for x86_64.
BUG=skia:3419
Review URL: https://codereview.chromium.org/916113002
Diffstat (limited to 'platform_tools/android/gyp')
| -rw-r--r-- | platform_tools/android/gyp/skia_android.gypi | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/platform_tools/android/gyp/skia_android.gypi b/platform_tools/android/gyp/skia_android.gypi index 210a61a13f..ace21ccae7 100644 --- a/platform_tools/android/gyp/skia_android.gypi +++ b/platform_tools/android/gyp/skia_android.gypi @@ -1,3 +1,4 @@ +# { 'targets': [ { @@ -18,10 +19,10 @@ [ 'skia_arch_type == "arm64"', { 'android_arch%': "arm64-v8a", }], - [ 'skia_arch_type == "x86" and skia_arch_width == 32', { + [ 'skia_arch_type == "x86"', { 'android_arch%': "x86", }], - [ 'skia_arch_type == "x86" and skia_arch_width == 64', { + [ 'skia_arch_type == "x86_64"', { 'android_arch%': "x86_64", }], [ 'skia_arch_type == "mips" and skia_arch_width == 32', { |