diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-05-31 10:09:38 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-05-31 10:16:29 -0700 |
| commit | 2a7155904570ac482612679abda7db9797eeaceb (patch) | |
| tree | 46d209dd7291ceeb1ee74714d7f2a5eb72f370fb /packaging | |
| parent | 4e16bd7dcedd38eab9dac86b6bae3b1858c59fbb (diff) | |
| download | subsurface-2a7155904570ac482612679abda7db9797eeaceb.tar.gz | |
Android build script: use interactive SDK install
And then manually fix the license as that doesn't appear to work correctly
in the tool.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/android/android-build-wrapper.sh | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/packaging/android/android-build-wrapper.sh b/packaging/android/android-build-wrapper.sh index 527ee38b0..a17d5ff37 100644 --- a/packaging/android/android-build-wrapper.sh +++ b/packaging/android/android-build-wrapper.sh @@ -88,7 +88,17 @@ if [ ! -d $ANDROID_SDK ] ; then mkdir $ANDROID_SDK pushd $ANDROID_SDK unzip -q ../$SDK_TOOLS - ( sleep 5 && while true ; do sleep 1; echo y; done ) | bash tools/android update sdk --no-ui -a -t 1,2,3,33 + echo "Please select the SDK Platform for the latest API and for API 16 (Android 4.2.1)" + echo "as well as the latest Android SDK Tools and Android SDK Platform-tools." + echo "You can unselect the various system images that usually are selected by default." + echo "Then accept the licenses and install." + bash tools/android update sdk + # ( sleep 5 && while true ; do sleep 1; echo y; done ) | bash tools/android update sdk --no-ui -a -t 1,2,3,33 + # this is copied from https://stackoverflow.com/questions/38096225/automatically-accept-all-sdk-licences + mkdir -p licenses + echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "licenses/android-sdk-license" + echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "licenses/android-sdk-preview-license" + popd fi |