Skip to content

Commit

Permalink
android: fix sdkmanager license issues
Browse files Browse the repository at this point in the history
In android-build-wrapper.sh:
- Always create the folder 'licenses'
- Export 'SDKMANAGER_OPTS'

Fixes a recent failure of the Android CI build
where 'licenses/android-sdk-license' was no found
after the 'yes | ...' call.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
  • Loading branch information
neolit123 committed Apr 28, 2018
1 parent 81a8125 commit 588457f
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions packaging/android/android-build-wrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ if [ ! -d $ANDROID_SDK ] ; then
mkdir $ANDROID_SDK
pushd $ANDROID_SDK
unzip -q ../$SDK_TOOLS
mkdir -p licenses
# use this fix from https://stackoverflow.com/a/47150411 or sdkmanager throws Java exceptions
export SDKMANAGER_OPTS='-XX:+IgnoreUnrecognizedVMOptions --add-modules java.se.ee'
yes | tools/bin/sdkmanager --licenses > /dev/null 2>&1 || echo "d56f5187479451eabf01fb78af6dfcb131a6481e" > licenses/android-sdk-license
cat licenses/android-sdk-license
echo ""
Expand Down

0 comments on commit 588457f

Please sign in to comment.