| OLD | NEW |
| 1 function exportVar { | 1 function exportVar { |
| 2 NAME=$1 | 2 NAME=$1 |
| 3 VALUE=$2 | 3 VALUE=$2 |
| 4 echo export $NAME=\"$VALUE\" | 4 echo export $NAME=\"$VALUE\" |
| 5 export $NAME="$VALUE" | 5 export $NAME="$VALUE" |
| 6 } | 6 } |
| 7 | 7 |
| 8 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" | 8 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" |
| 9 | 9 |
| 10 # A valid Android SDK installation is required to build the sample app. | 10 # A valid Android SDK installation is required to build the sample app. |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 echo " target_os = ['android']" | 35 echo " target_os = ['android']" |
| 36 echo "" | 36 echo "" |
| 37 exit 1; | 37 exit 1; |
| 38 fi | 38 fi |
| 39 | 39 |
| 40 # determine the toolchain that we will be using | 40 # determine the toolchain that we will be using |
| 41 API_LEVEL=14 | 41 API_LEVEL=14 |
| 42 | 42 |
| 43 if [[ -z "$NDK_REV" ]]; | 43 if [[ -z "$NDK_REV" ]]; |
| 44 then | 44 then |
| 45 NDK_REV="8d" | 45 NDK_REV="8e" |
| 46 fi | 46 fi |
| 47 | 47 |
| 48 if [[ -z "$ANDROID_ARCH" ]]; | 48 if [[ -z "$ANDROID_ARCH" ]]; |
| 49 then | 49 then |
| 50 ANDROID_ARCH="arm" | 50 ANDROID_ARCH="arm" |
| 51 fi | 51 fi |
| 52 | 52 |
| 53 TOOLCHAIN_DIR=${SCRIPT_DIR}/../toolchains | 53 TOOLCHAIN_DIR=${SCRIPT_DIR}/../toolchains |
| 54 if [ $(uname) == "Linux" ]; then | 54 if [ $(uname) == "Linux" ]; then |
| 55 echo "Using Linux toolchain." | 55 echo "Using Linux toolchain." |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 227 if [ "${ANDROID_MD5:0:32}" != "${HOST_MD5:0:32}" ]; | 227 if [ "${ANDROID_MD5:0:32}" != "${HOST_MD5:0:32}" ]; |
| 228 then | 228 then |
| 229 $ADB pull $ANDROID_SRC $HOST_DST | 229 $ADB pull $ANDROID_SRC $HOST_DST |
| 230 # else | 230 # else |
| 231 # echo "md5 match of android [$ANDROID_SRC] and host [$HOST_DST]" | 231 # echo "md5 match of android [$ANDROID_SRC] and host [$HOST_DST]" |
| 232 fi | 232 fi |
| 233 else | 233 else |
| 234 $ADB pull $ANDROID_SRC $HOST_DST | 234 $ADB pull $ANDROID_SRC $HOST_DST |
| 235 fi | 235 fi |
| 236 } | 236 } |
| OLD | NEW |