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/bin/android_setup.sh | |
| 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/bin/android_setup.sh')
| -rwxr-xr-x | platform_tools/android/bin/android_setup.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh index eaa6ac531a..3c6d44d84f 100755 --- a/platform_tools/android/bin/android_setup.sh +++ b/platform_tools/android/bin/android_setup.sh @@ -116,16 +116,16 @@ setup_device() { ANDROID_ARCH="arm" ;; intel_rhb | razr_i) - DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=32" + DEFINES="${DEFINES} skia_arch_type=x86" DEFINES="${DEFINES} skia_resource_cache_mb_limit=32" ANDROID_ARCH="x86" ;; x86) - DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=32" + DEFINES="${DEFINES} skia_arch_type=x86" ANDROID_ARCH="x86" ;; x86_64 | x64) - DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=64" + DEFINES="${DEFINES} skia_arch_type=x86_64" ANDROID_ARCH="x86_64" ;; arm_v7) |