| OLD | NEW | 
|---|
| 1 # Copyright 2015 Google Inc. | 1 # Copyright 2015 Google Inc. | 
| 2 # | 2 # | 
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be | 
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. | 
| 5 | 5 | 
| 6 #!/bin/bash | 6 #!/bin/bash | 
| 7 # | 7 # | 
| 8 # setup_toolchain.sh: Sets toolchain environment variables used by other scripts
     . | 8 # setup_toolchain.sh: Sets toolchain environment variables used by other scripts
     . | 
| 9 | 9 | 
| 10 # Fail-fast if anything in the script fails. | 10 # Fail-fast if anything in the script fails. | 
| (...skipping 17 matching lines...) Expand all  Loading... | 
| 28 | 28 | 
| 29 if [ -z "$SCRIPT_DIR" ]; then | 29 if [ -z "$SCRIPT_DIR" ]; then | 
| 30   echo "ERROR: The SCRIPT_DIR variable is expected to be defined" | 30   echo "ERROR: The SCRIPT_DIR variable is expected to be defined" | 
| 31   return 1 | 31   return 1 | 
| 32 fi | 32 fi | 
| 33 | 33 | 
| 34 function default_toolchain() { | 34 function default_toolchain() { | 
| 35   TOOLCHAINS=${SCRIPT_DIR}/../toolchains | 35   TOOLCHAINS=${SCRIPT_DIR}/../toolchains | 
| 36 | 36 | 
| 37   ANDROID_ARCH=${ANDROID_ARCH-arm} | 37   ANDROID_ARCH=${ANDROID_ARCH-arm} | 
| 38   NDK=r11 | 38   NDK=r11b | 
| 39 | 39 | 
| 40   if [[ $ANDROID_ARCH == *64* ]]; then | 40   if [[ $ANDROID_ARCH == *64* ]]; then | 
| 41       API=21  # Android 5.0 | 41       API=21  # Android 5.0 | 
| 42   else | 42   else | 
| 43       API=14  # Android 4.0 | 43       API=14  # Android 4.0 | 
| 44   fi | 44   fi | 
| 45 | 45 | 
| 46   TOOLCHAIN=$ANDROID_ARCH-$NDK-$API | 46   TOOLCHAIN=$ANDROID_ARCH-$NDK-$API | 
| 47   HOST=`uname | tr '[A-Z]' '[a-z]'` | 47   HOST=`uname | tr '[A-Z]' '[a-z]'` | 
| 48 | 48 | 
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 143 # Create symlinks for nm & readelf and add them to the path so that the ninja | 143 # Create symlinks for nm & readelf and add them to the path so that the ninja | 
| 144 # build uses them instead of attempting to use the one on the system. | 144 # build uses them instead of attempting to use the one on the system. | 
| 145 # This is required to build using ninja on a Mac. | 145 # This is required to build using ninja on a Mac. | 
| 146 if [ $(uname) == "Darwin" ]; then | 146 if [ $(uname) == "Darwin" ]; then | 
| 147   ln -sf $ANDROID_TOOLCHAIN_PREFIX-nm $ANDROID_TOOLCHAIN/nm | 147   ln -sf $ANDROID_TOOLCHAIN_PREFIX-nm $ANDROID_TOOLCHAIN/nm | 
| 148   ln -sf $ANDROID_TOOLCHAIN_PREFIX-readelf $ANDROID_TOOLCHAIN/readelf | 148   ln -sf $ANDROID_TOOLCHAIN_PREFIX-readelf $ANDROID_TOOLCHAIN/readelf | 
| 149   ln -sf $ANDROID_TOOLCHAIN_PREFIX-as $ANDROID_TOOLCHAIN/as | 149   ln -sf $ANDROID_TOOLCHAIN_PREFIX-as $ANDROID_TOOLCHAIN/as | 
| 150 fi | 150 fi | 
| 151 | 151 | 
| 152 exportVar PATH $ANDROID_TOOLCHAIN:$PATH | 152 exportVar PATH $ANDROID_TOOLCHAIN:$PATH | 
| OLD | NEW | 
|---|