| OLD | NEW |
| 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 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 else | 215 else |
| 216 HOST_MD5=`md5sum $HOST_SRC` | 216 HOST_MD5=`md5sum $HOST_SRC` |
| 217 fi | 217 fi |
| 218 | 218 |
| 219 if [ "${ANDROID_MD5:0:32}" != "${HOST_MD5:0:32}" ]; then | 219 if [ "${ANDROID_MD5:0:32}" != "${HOST_MD5:0:32}" ]; then |
| 220 echo -n "$ANDROID_DST " | 220 echo -n "$ANDROID_DST " |
| 221 $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST | 221 $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST |
| 222 fi | 222 fi |
| 223 else | 223 else |
| 224 echo -n "$ANDROID_DST " | 224 echo -n "$ANDROID_DST " |
| 225 $ADB $DEVICE_SERIAL shell mkdir -p "$(dirname "$ANDROID_DST")" |
| 225 $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST | 226 $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST |
| 226 fi | 227 fi |
| 227 } | 228 } |
| 228 | 229 |
| 229 setup_device "${DEVICE_ID}" | 230 setup_device "${DEVICE_ID}" |
| OLD | NEW |