OLD | NEW |
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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
63 | 63 |
64 if [ -z "$ANDROID_SDK_ROOT" ]; then | 64 if [ -z "$ANDROID_SDK_ROOT" ]; then |
65 if ANDROID_SDK_ROOT="$(dirname $(which android))/.."; then | 65 if ANDROID_SDK_ROOT="$(dirname $(which android))/.."; then |
66 exportVar ANDROID_SDK_ROOT $ANDROID_SDK_ROOT | 66 exportVar ANDROID_SDK_ROOT $ANDROID_SDK_ROOT |
67 else | 67 else |
68 echo "No ANDROID_SDK_ROOT set and can't auto detect it from location of and
roid binary." | 68 echo "No ANDROID_SDK_ROOT set and can't auto detect it from location of and
roid binary." |
69 exit 1 | 69 exit 1 |
70 fi | 70 fi |
71 fi | 71 fi |
72 | 72 |
| 73 if [ -z "$ANDROID_HOME" ]; then |
| 74 echo "ANDROID_HOME not set so we are setting it to a default value of ANDROID_
SDK_ROOT" |
| 75 exportVar ANDROID_HOME $ANDROID_SDK_ROOT |
| 76 fi |
| 77 |
73 # check to see that gclient sync ran successfully | 78 # check to see that gclient sync ran successfully |
74 THIRD_PARTY_EXTERNAL_DIR=${SCRIPT_DIR}/../third_party/externals | 79 THIRD_PARTY_EXTERNAL_DIR=${SCRIPT_DIR}/../third_party/externals |
75 if [ ! -d "$THIRD_PARTY_EXTERNAL_DIR" ]; then | 80 if [ ! -d "$THIRD_PARTY_EXTERNAL_DIR" ]; then |
76 echo "" | 81 echo "" |
77 echo "ERROR: Unable to find the required third_party dependencies needed
to build." | 82 echo "ERROR: Unable to find the required third_party dependencies needed
to build." |
78 echo " To fix this add the following line to your .gclient file an
d run 'gclient sync'" | 83 echo " To fix this add the following line to your .gclient file an
d run 'gclient sync'" |
79 echo " target_os = ['android']" | 84 echo " target_os = ['android']" |
80 echo "" | 85 echo "" |
81 exit 1; | 86 exit 1; |
82 fi | 87 fi |
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
257 adb_push_if_needed $HOST_SRC $ANDROID_DST | 262 adb_push_if_needed $HOST_SRC $ANDROID_DST |
258 else | 263 else |
259 echo -n "$ANDROID_DST " | 264 echo -n "$ANDROID_DST " |
260 $ADB $DEVICE_SERIAL shell mkdir -p "$(dirname "$ANDROID_DST")" | 265 $ADB $DEVICE_SERIAL shell mkdir -p "$(dirname "$ANDROID_DST")" |
261 $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST | 266 $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST |
262 fi | 267 fi |
263 fi | 268 fi |
264 } | 269 } |
265 | 270 |
266 setup_device "${DEVICE_ID}" | 271 setup_device "${DEVICE_ID}" |
OLD | NEW |