diff options
| author |  Brian Salomon <bsalomon@google.com> | 2015-07-27 09:10:36 -0400 |
|---|---|---|
| committer | Brian Salomon <bsalomon@google.com> | 2015-07-27 09:10:36 -0400 |
| commit | 4239fc2f69bdbd1a1f01ee66112f46033b47b743 (patch) | |
| tree | f454132d380102baf30567e61445c73a4f45aa7c /platform_tools | |
| parent | cef14bf9ce626e6e6582f3aac18c8e176b987f3e (diff) | |
Remove skia_arch_width, fold into skia_arch_type.
DOCS_PREVIEW= https://skia.org/?cl=1228553010
BUG=skia:4042
R=borenet@google.com, mtklein@google.com
Review URL: https://codereview.chromium.org/1228553010
Diffstat (limited to 'platform_tools')
| -rwxr-xr-x | platform_tools/android/bin/android_setup.sh | 8 | ||||
| -rw-r--r-- | platform_tools/android/gyp/dependencies.gypi | 2 | ||||
| -rw-r--r-- | platform_tools/android/gyp/skia_android.gypi | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh index 5396294c7f..af2356945c 100755 --- a/platform_tools/android/bin/android_setup.sh +++ b/platform_tools/android/bin/android_setup.sh @@ -124,7 +124,7 @@ setup_device() { ANDROID_ARCH="arm" ;; arm64 | nexus_9) - DEFINES="${DEFINES} skia_arch_type=arm64 skia_arch_width=64 arm_version=8" + DEFINES="${DEFINES} skia_arch_type=arm64 arm_version=8" ANDROID_ARCH="arm64" ;; x86) @@ -136,17 +136,17 @@ setup_device() { ANDROID_ARCH="x86_64" ;; mips) - DEFINES="${DEFINES} skia_arch_type=mips skia_arch_width=32" + DEFINES="${DEFINES} skia_arch_type=mips32" DEFINES="${DEFINES} skia_resource_cache_mb_limit=32" ANDROID_ARCH="mips" ;; mips_dsp2) - DEFINES="${DEFINES} skia_arch_type=mips skia_arch_width=32" + DEFINES="${DEFINES} skia_arch_type=mips32" DEFINES="${DEFINES} mips_arch_variant=mips32r2 mips_dsp=2" ANDROID_ARCH="mips" ;; mips64) - DEFINES="${DEFINES} skia_arch_type=mips skia_arch_width=64" + DEFINES="${DEFINES} skia_arch_type=mips64" ANDROID_ARCH="mips64" ;; *) diff --git a/platform_tools/android/gyp/dependencies.gypi b/platform_tools/android/gyp/dependencies.gypi index 036abf2cc5..fb9e80bb4a 100644 --- a/platform_tools/android/gyp/dependencies.gypi +++ b/platform_tools/android/gyp/dependencies.gypi @@ -195,7 +195,7 @@ ], }, ], - [ 'skia_arch_type == "mips" and mips_dsp == 2', + [ '"mips" in skia_arch_type and mips_dsp == 2', { 'sources' : [ '../third_party/externals/jpeg/mips_jidctfst.c', diff --git a/platform_tools/android/gyp/skia_android.gypi b/platform_tools/android/gyp/skia_android.gypi index 6ffb49cd93..18de5893f5 100644 --- a/platform_tools/android/gyp/skia_android.gypi +++ b/platform_tools/android/gyp/skia_android.gypi @@ -30,11 +30,11 @@ 'android_arch%': "x86_64", 'android_variant%': "x86_64", }], - [ 'skia_arch_type == "mips" and skia_arch_width == 32', { + [ 'skia_arch_type == "mips32"', { 'android_arch%': "mips", 'android_variant%': "mips", }], - [ 'skia_arch_type == "mips" and skia_arch_width == 64', { + [ 'skia_arch_type == "mips64"', { 'android_arch%': "mips64", 'android_variant%': "mips64", }], |