Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DO-NOT-MERGE: debug android CI #1225

Closed
wants to merge 8 commits into from
Closed

DO-NOT-MERGE: debug android CI #1225

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
588457f
android: fix sdkmanager license issues
neolit123 Apr 28, 2018
829de10
android: fix "undefined reference to 'stdout'
neolit123 Apr 29, 2018
10fd312
android: update NDK to 16b
neolit123 Apr 29, 2018
aa4c809
android: build libzip using cmake
neolit123 Apr 29, 2018
aba40db
android: use clang instead of gcc
neolit123 Apr 29, 2018
0ac2a30
android: hack HAVE_FTS_H in libzip's zipcmp.c
neolit123 Apr 29, 2018
d031bb9
android: find makedepend
neolit123 Apr 30, 2018
db2ca2c
android: hack the OpenSSL Makefile for Clang
neolit123 Apr 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions packaging/android/android-build-wrapper.sh
View file
Open in desktop
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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the weird thing is that this last line after the '||' already tries to manually force a license. I assume that key is no longer valid or something?
If your solution works more reliably, even better.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think the export made the call before || work.

cat licenses/android-sdk-license
echo ""
Expand Down