factotum/libressl-portable
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Land #575, fix android build

Browse Source
This commit is contained in:
Brent Cook 2020-03-26 19:01:20 -05:00
commit 81e279b691
2 changed files with 4 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
.travis.yml
View File

@ -44,16 +44,10 @@ matrix:
sudo: required sudo: required
android: android:
components: components:
- tools
- tools - tools
- platform-tools - platform-tools
- build-tools-27.0.3
- android-27
- extra-google-m2repository - extra-google-m2repository
- extra-android-m2repository - extra-android-m2repository
licenses:
- 'android-sdk-preview-license-.+'
- 'android-sdk-license-.+'
- language: android - language: android
name: "Android 5.x" name: "Android 5.x"
env: ARCH=android MIN_NAL=21 MAX_NAL=22 env: ARCH=android MIN_NAL=21 MAX_NAL=22
@ -61,16 +55,10 @@ matrix:
sudo: required sudo: required
android: android:
components: components:
- tools
- tools - tools
- platform-tools - platform-tools
- build-tools-27.0.3
- android-27
- extra-google-m2repository - extra-google-m2repository
- extra-android-m2repository - extra-android-m2repository
licenses:
- 'android-sdk-preview-license-.+'
- 'android-sdk-license-.+'
- language: android - language: android
name: "Android 6.x 7.x" name: "Android 6.x 7.x"
env: ARCH=android MIN_NAL=23 MAX_NAL=25 env: ARCH=android MIN_NAL=23 MAX_NAL=25
@ -78,16 +66,10 @@ matrix:
sudo: required sudo: required
android: android:
components: components:
- tools
- tools - tools
- platform-tools - platform-tools
- build-tools-27.0.3
- android-27
- extra-google-m2repository - extra-google-m2repository
- extra-android-m2repository - extra-android-m2repository
licenses:
- 'android-sdk-preview-license-.+'
- 'android-sdk-license-.+'
- language: android - language: android
name: "Android 8.x" name: "Android 8.x"
env: ARCH=android MIN_NAL=26 MAX_NAL=27 env: ARCH=android MIN_NAL=26 MAX_NAL=27
@ -95,33 +77,21 @@ matrix:
sudo: required sudo: required
android: android:
components: components:
- tools
- tools - tools
- platform-tools - platform-tools
- build-tools-27.0.3
- android-27
- extra-google-m2repository - extra-google-m2repository
- extra-android-m2repository - extra-android-m2repository
licenses:
- 'android-sdk-preview-license-.+'
- 'android-sdk-license-.+'
- language: android - language: android
name: "Android 9.x" name: "Android 9.x 10.x"
env: ARCH=android MIN_NAL=28 MAX_NAL=28 env: ARCH=android MIN_NAL=28 MAX_NAL=29
dist: trusty dist: trusty
sudo: required sudo: required
android: android:
components: components:
- tools
- tools - tools
- platform-tools - platform-tools
- build-tools-27.0.3
- android-27
- extra-google-m2repository - extra-google-m2repository
- extra-android-m2repository - extra-android-m2repository
licenses:
- 'android-sdk-preview-license-.+'
- 'android-sdk-license-.+'
script: script:
"./scripts/travis" "./scripts/travis"

5
scripts/travis
View File

@ -97,11 +97,10 @@ elif [ "x$ARCH" = "xarm32" -o "x$ARCH" = "xarm64" ]; then
file apps/openssl/.libs/openssl file apps/openssl/.libs/openssl
elif [ "x$ARCH" = "xandroid" ]; then elif [ "x$ARCH" = "xandroid" ]; then
touch $HOME/.android/repositories.cfg
echo y | sdkmanager 'ndk-bundle' echo y | sdkmanager 'ndk-bundle'
echo y | sdkmanager 'ndk;20.1.5948944'
echo y | sdkmanager 'cmake;3.6.4111459' echo y | sdkmanager 'cmake;3.6.4111459'
echo y | sdkmanager 'lldb;3.0'
echo y | sdkmanager --update
echo y | sdkmanager --licenses
export CMAKE=$ANDROID_HOME/cmake/3.6.4111459/bin/cmake export CMAKE=$ANDROID_HOME/cmake/3.6.4111459/bin/cmake
export NINJA=$ANDROID_HOME/cmake/3.6.4111459/bin/ninja export NINJA=$ANDROID_HOME/cmake/3.6.4111459/bin/ninja