Browse Source

Make install-sdk.sh not assume android is in $PATH

Also update the build-tools to latest 23.0.2
android-5
Fredrik Fornwall 9 years ago
parent
commit
1931a64d98
  1. 2
      build-package.sh
  2. 7
      install-sdk.sh

2
build-package.sh

@ -43,7 +43,7 @@ if [ $TERMUX_ARCH = "arm" ]; then TERMUX_HOST_PLATFORM="${TERMUX_HOST_PLATFORM}e
: ${TERMUX_GCC_VERSION:="4.9"} : ${TERMUX_GCC_VERSION:="4.9"}
: ${TERMUX_API_LEVEL:="21"} : ${TERMUX_API_LEVEL:="21"}
: ${TERMUX_STANDALONE_TOOLCHAIN:="$HOME/lib/android-standalone-toolchain-${TERMUX_ARCH}-api${TERMUX_API_LEVEL}-gcc${TERMUX_GCC_VERSION}"} : ${TERMUX_STANDALONE_TOOLCHAIN:="$HOME/lib/android-standalone-toolchain-${TERMUX_ARCH}-api${TERMUX_API_LEVEL}-gcc${TERMUX_GCC_VERSION}"}
: ${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="23.0.0"} : ${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="23.0.2"}
# We do not put all of build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/ into PATH # We do not put all of build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/ into PATH
# to avoid stuff like arm-linux-androideabi-ld there to conflict with ones from # to avoid stuff like arm-linux-androideabi-ld there to conflict with ones from
# the standalone toolchain. # the standalone toolchain.

7
install-sdk.sh

@ -1,3 +1,8 @@
#!/bin/sh #!/bin/sh
android update sdk --all --no-https --no-ui --filter build-tools-23.0.0,android-21 # Read settings from .termuxrc if existing
test -f $HOME/.termuxrc && . $HOME/.termuxrc
: ${ANDROID_HOME:="${HOME}/lib/android-sdk"}
$ANDROID_HOME/tools/android update sdk --no-ui --all --no-https -t "build-tools-23.0.2"
$ANDROID_HOME/tools/android update sdk --no-ui --all --no-https -t "android-21"

Loading…
Cancel
Save