Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(144)

Side by Side Diff: platform_tools/android/bin/android_setup.sh

Issue 1178013008: Use the upstream version of libwebp, v0.4.3. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Remove README, put more info in config.h Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « gyp/libwebp_skia.gypi ('k') | resources/invalid_images/skbug3429.webp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 ############################################################################### 2 ###############################################################################
3 # Copyright 2015 Google Inc. 3 # Copyright 2015 Google Inc.
4 # 4 #
5 # Use of this source code is governed by a BSD-style license that can be 5 # Use of this source code is governed by a BSD-style license that can be
6 # found in the LICENSE file. 6 # found in the LICENSE file.
7 ############################################################################### 7 ###############################################################################
8 # 8 #
9 # android_setup.sh: Sets environment variables used by other Android scripts. 9 # android_setup.sh: Sets environment variables used by other Android scripts.
10 10
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 ;; 112 ;;
113 arm_v7 | xoom) 113 arm_v7 | xoom)
114 DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7" 114 DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7"
115 ANDROID_ARCH="arm" 115 ANDROID_ARCH="arm"
116 ;; 116 ;;
117 arm_v7_neon | nexus_4 | nexus_5 | nexus_6 | nexus_7 | nexus_10) 117 arm_v7_neon | nexus_4 | nexus_5 | nexus_6 | nexus_7 | nexus_10)
118 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 arm_version=7" 118 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 arm_version=7"
119 ANDROID_ARCH="arm" 119 ANDROID_ARCH="arm"
120 ;; 120 ;;
121 arm64 | nexus_9) 121 arm64 | nexus_9)
122 DEFINES="${DEFINES} skia_arch_type=arm64 skia_arch_width=64" 122 DEFINES="${DEFINES} skia_arch_type=arm64 skia_arch_width=64 arm_version=8"
123 ANDROID_ARCH="arm64" 123 ANDROID_ARCH="arm64"
124 ;; 124 ;;
125 x86) 125 x86)
126 DEFINES="${DEFINES} skia_arch_type=x86" 126 DEFINES="${DEFINES} skia_arch_type=x86"
127 ANDROID_ARCH="x86" 127 ANDROID_ARCH="x86"
128 ;; 128 ;;
129 x86_64 | x64) 129 x86_64 | x64)
130 DEFINES="${DEFINES} skia_arch_type=x86_64" 130 DEFINES="${DEFINES} skia_arch_type=x86_64"
131 ANDROID_ARCH="x86_64" 131 ANDROID_ARCH="x86_64"
132 ;; 132 ;;
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 adb_push_if_needed $HOST_SRC $ANDROID_DST 257 adb_push_if_needed $HOST_SRC $ANDROID_DST
258 else 258 else
259 echo -n "$ANDROID_DST " 259 echo -n "$ANDROID_DST "
260 $ADB $DEVICE_SERIAL shell mkdir -p "$(dirname "$ANDROID_DST")" 260 $ADB $DEVICE_SERIAL shell mkdir -p "$(dirname "$ANDROID_DST")"
261 $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST 261 $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST
262 fi 262 fi
263 fi 263 fi
264 } 264 }
265 265
266 setup_device "${DEVICE_ID}" 266 setup_device "${DEVICE_ID}"
OLDNEW
« no previous file with comments | « gyp/libwebp_skia.gypi ('k') | resources/invalid_images/skbug3429.webp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698