BearND has uploaded a new change for review. https://gerrit.wikimedia.org/r/173440
Change subject: Update SDK download/update scripts for new location ...................................................................... Update SDK download/update scripts for new location Also ran the update script to update the SDK for 5.0 Change-Id: I13485e9e4e27658ac28c08d60ddd4b75fc75fb1d --- M bin/download-android-sdk.bash M bin/update-android-sdk.bash 2 files changed, 5 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/wikipedia-android-builds refs/changes/40/173440/1 diff --git a/bin/download-android-sdk.bash b/bin/download-android-sdk.bash index 139450d..b395fe0 100644 --- a/bin/download-android-sdk.bash +++ b/bin/download-android-sdk.bash @@ -1,5 +1,4 @@ -SDK_HOME_PATH="$HOME" -SDK_PATH="$SDK_HOME_PATH/android-sdk-linux" +SDK_HOME_PATH="/srv/adk" # Needs to be updated when new releases are made SDK_DOWNLOAD_URL="http://dl.google.com/android/android-sdk_r23.0.2-linux.tgz"; diff --git a/bin/update-android-sdk.bash b/bin/update-android-sdk.bash index 7281493..c28fba1 100644 --- a/bin/update-android-sdk.bash +++ b/bin/update-android-sdk.bash @@ -1,8 +1,8 @@ -SDK_HOME_PATH="$HOME" -SDK_PATH="$SDK_HOME_PATH/android-sdk-linux" -SDK_PACKAGES="tools,platform-tools,build-tools-20.0.0,android-19,extra-android-m2repository" +SDK_PATH="/srv/adk" +SDK_PACKAGES="tools,platform-tools,build-tools-21.1.1,android-21,extra-android-m2repository" +export JAVA_HOME="/usr/lib/jvm/java-7-openjdk-amd64" export _JAVA_OPTIONS="-Xmx256m" -export ANDROID_SWT="/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/ext:/usr/java/packages/lib/ext" +export ANDROID_SWT="/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/ext" # Just install platform-tools, build-tools & Android-19 # Filter names are from `android list sdk -e -a` -- To view, visit https://gerrit.wikimedia.org/r/173440 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I13485e9e4e27658ac28c08d60ddd4b75fc75fb1d Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/wikipedia-android-builds Gerrit-Branch: master Gerrit-Owner: BearND <bsitzm...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
