aboutsummaryrefslogtreecommitdiffhomepage
path: root/platform_tools
diff options
context:
space:
mode:
authorGravatar scroggo <scroggo@chromium.org>2015-07-10 09:32:09 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-07-10 09:32:09 -0700
commit139491fbaa6fc926456a246bb28e09848e0e48f5 (patch)
tree3cbb6ad0ae2db8c4d18a5be3a83d34ed4ea156d1 /platform_tools
parent416e14f517f91e3d8b24ed99f5ca56fc5ec6ceee (diff)
Use the upstream version of libwebp, v0.4.3.
DEPS: Update to pull v0.4.3 of libwebp from upstream gyp/libwebp.gyp: Add new files, as referenced by the gyp file used by Chromium. resource/tests: Add regression tests for particular images. BUG=skia:3442 BUG=skia:3315 BUG=skia:3429 Committed: https://skia.googlesource.com/skia/+/3aa0fb4d80c76b559ff4b82d5e569993aea06da1 Review URL: https://codereview.chromium.org/1178013008
Diffstat (limited to 'platform_tools')
-rwxr-xr-xplatform_tools/android/bin/android_setup.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh
index efa5880932..94ae87f9a1 100755
--- a/platform_tools/android/bin/android_setup.sh
+++ b/platform_tools/android/bin/android_setup.sh
@@ -119,7 +119,7 @@ setup_device() {
ANDROID_ARCH="arm"
;;
arm64 | nexus_9)
- DEFINES="${DEFINES} skia_arch_type=arm64 skia_arch_width=64"
+ DEFINES="${DEFINES} skia_arch_type=arm64 skia_arch_width=64 arm_version=8"
ANDROID_ARCH="arm64"
;;
x86)