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

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

Issue 506403004: add n5 (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 3 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 | « no previous file | no next file » | 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 # android_setup.sh: Sets environment variables used by other Android scripts. 3 # android_setup.sh: Sets environment variables used by other Android scripts.
4 4
5 # Fail-fast if anything in the script fails. 5 # Fail-fast if anything in the script fails.
6 set -e 6 set -e
7 7
8 BUILDTYPE=${BUILDTYPE-Debug} 8 BUILDTYPE=${BUILDTYPE-Debug}
9 9
10 while (( "$#" )); do 10 while (( "$#" )); do
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 ANDROID_ARCH="x86" 117 ANDROID_ARCH="x86"
118 ;; 118 ;;
119 x86_64 | x64) 119 x86_64 | x64)
120 DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=64" 120 DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=64"
121 ANDROID_ARCH="x86_64" 121 ANDROID_ARCH="x86_64"
122 ;; 122 ;;
123 arm_v7) 123 arm_v7)
124 DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7 a rm_thumb=0" 124 DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7 a rm_thumb=0"
125 ANDROID_ARCH="arm" 125 ANDROID_ARCH="arm"
126 ;; 126 ;;
127 arm_v7_thumb | nvidia_logan) 127 arm_v7_thumb | nvidia_logan | nexus_5)
128 DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7 a rm_thumb=1" 128 DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7 a rm_thumb=1"
129 ANDROID_ARCH="arm" 129 ANDROID_ARCH="arm"
130 ;; 130 ;;
131 arm) 131 arm)
132 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 arm_thumb=0" 132 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 arm_thumb=0"
133 ANDROID_ARCH="arm" 133 ANDROID_ARCH="arm"
134 ;; 134 ;;
135 arm_thumb) 135 arm_thumb)
136 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 arm_thumb=1" 136 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 arm_thumb=1"
137 ANDROID_ARCH="arm" 137 ANDROID_ARCH="arm"
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 adb_push_if_needed $HOST_SRC $ANDROID_DST 262 adb_push_if_needed $HOST_SRC $ANDROID_DST
263 else 263 else
264 echo -n "$ANDROID_DST " 264 echo -n "$ANDROID_DST "
265 $ADB $DEVICE_SERIAL shell mkdir -p "$(dirname "$ANDROID_DST")" 265 $ADB $DEVICE_SERIAL shell mkdir -p "$(dirname "$ANDROID_DST")"
266 $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST 266 $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST
267 fi 267 fi
268 fi 268 fi
269 } 269 }
270 270
271 setup_device "${DEVICE_ID}" 271 setup_device "${DEVICE_ID}"
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698