diff options
| author | Brent Cook <busterb@gmail.com> | 2020-03-26 19:01:20 -0500 |
|---|---|---|
| committer | Brent Cook <busterb@gmail.com> | 2020-03-26 19:01:20 -0500 |
| commit | 81e279b69149ecffdb3e7adff789e9031d5d5683 (patch) | |
| tree | 8d801f7e6dde7f609d72155a843498c6f813a2ad | |
| parent | d62235af8132fbce5cc320eae295aab1c177c128 (diff) | |
| parent | 6edfcc97dd6a5e349cd1aadc415b5a1889820215 (diff) | |
| download | portable-81e279b69149ecffdb3e7adff789e9031d5d5683.tar.gz portable-81e279b69149ecffdb3e7adff789e9031d5d5683.tar.bz2 portable-81e279b69149ecffdb3e7adff789e9031d5d5683.zip | |
Land #575, fix android build
| -rw-r--r-- | .travis.yml | 34 | ||||
| -rwxr-xr-x | scripts/travis | 5 |
2 files changed, 4 insertions, 35 deletions
diff --git a/.travis.yml b/.travis.yml index 9b983bb..5ccd5b1 100644 --- a/.travis.yml +++ b/.travis.yml | |||
| @@ -45,15 +45,9 @@ matrix: | |||
| 45 | android: | 45 | android: |
| 46 | components: | 46 | components: |
| 47 | - tools | 47 | - tools |
| 48 | - tools | ||
| 49 | - platform-tools | 48 | - platform-tools |
| 50 | - build-tools-27.0.3 | ||
| 51 | - android-27 | ||
| 52 | - extra-google-m2repository | 49 | - extra-google-m2repository |
| 53 | - extra-android-m2repository | 50 | - extra-android-m2repository |
| 54 | licenses: | ||
| 55 | - 'android-sdk-preview-license-.+' | ||
| 56 | - 'android-sdk-license-.+' | ||
| 57 | - language: android | 51 | - language: android |
| 58 | name: "Android 5.x" | 52 | name: "Android 5.x" |
| 59 | env: ARCH=android MIN_NAL=21 MAX_NAL=22 | 53 | env: ARCH=android MIN_NAL=21 MAX_NAL=22 |
| @@ -62,15 +56,9 @@ matrix: | |||
| 62 | android: | 56 | android: |
| 63 | components: | 57 | components: |
| 64 | - tools | 58 | - tools |
| 65 | - tools | ||
| 66 | - platform-tools | 59 | - platform-tools |
| 67 | - build-tools-27.0.3 | ||
| 68 | - android-27 | ||
| 69 | - extra-google-m2repository | 60 | - extra-google-m2repository |
| 70 | - extra-android-m2repository | 61 | - extra-android-m2repository |
| 71 | licenses: | ||
| 72 | - 'android-sdk-preview-license-.+' | ||
| 73 | - 'android-sdk-license-.+' | ||
| 74 | - language: android | 62 | - language: android |
| 75 | name: "Android 6.x 7.x" | 63 | name: "Android 6.x 7.x" |
| 76 | env: ARCH=android MIN_NAL=23 MAX_NAL=25 | 64 | env: ARCH=android MIN_NAL=23 MAX_NAL=25 |
| @@ -79,15 +67,9 @@ matrix: | |||
| 79 | android: | 67 | android: |
| 80 | components: | 68 | components: |
| 81 | - tools | 69 | - tools |
| 82 | - tools | ||
| 83 | - platform-tools | 70 | - platform-tools |
| 84 | - build-tools-27.0.3 | ||
| 85 | - android-27 | ||
| 86 | - extra-google-m2repository | 71 | - extra-google-m2repository |
| 87 | - extra-android-m2repository | 72 | - extra-android-m2repository |
| 88 | licenses: | ||
| 89 | - 'android-sdk-preview-license-.+' | ||
| 90 | - 'android-sdk-license-.+' | ||
| 91 | - language: android | 73 | - language: android |
| 92 | name: "Android 8.x" | 74 | name: "Android 8.x" |
| 93 | env: ARCH=android MIN_NAL=26 MAX_NAL=27 | 75 | env: ARCH=android MIN_NAL=26 MAX_NAL=27 |
| @@ -96,32 +78,20 @@ matrix: | |||
| 96 | android: | 78 | android: |
| 97 | components: | 79 | components: |
| 98 | - tools | 80 | - tools |
| 99 | - tools | ||
| 100 | - platform-tools | 81 | - platform-tools |
| 101 | - build-tools-27.0.3 | ||
| 102 | - android-27 | ||
| 103 | - extra-google-m2repository | 82 | - extra-google-m2repository |
| 104 | - extra-android-m2repository | 83 | - extra-android-m2repository |
| 105 | licenses: | ||
| 106 | - 'android-sdk-preview-license-.+' | ||
| 107 | - 'android-sdk-license-.+' | ||
| 108 | - language: android | 84 | - language: android |
| 109 | name: "Android 9.x" | 85 | name: "Android 9.x 10.x" |
| 110 | env: ARCH=android MIN_NAL=28 MAX_NAL=28 | 86 | env: ARCH=android MIN_NAL=28 MAX_NAL=29 |
| 111 | dist: trusty | 87 | dist: trusty |
| 112 | sudo: required | 88 | sudo: required |
| 113 | android: | 89 | android: |
| 114 | components: | 90 | components: |
| 115 | - tools | 91 | - tools |
| 116 | - tools | ||
| 117 | - platform-tools | 92 | - platform-tools |
| 118 | - build-tools-27.0.3 | ||
| 119 | - android-27 | ||
| 120 | - extra-google-m2repository | 93 | - extra-google-m2repository |
| 121 | - extra-android-m2repository | 94 | - extra-android-m2repository |
| 122 | licenses: | ||
| 123 | - 'android-sdk-preview-license-.+' | ||
| 124 | - 'android-sdk-license-.+' | ||
| 125 | 95 | ||
| 126 | script: | 96 | script: |
| 127 | "./scripts/travis" | 97 | "./scripts/travis" |
diff --git a/scripts/travis b/scripts/travis index 3e794e7..88e40eb 100755 --- a/scripts/travis +++ b/scripts/travis | |||
| @@ -97,11 +97,10 @@ elif [ "x$ARCH" = "xarm32" -o "x$ARCH" = "xarm64" ]; then | |||
| 97 | file apps/openssl/.libs/openssl | 97 | file apps/openssl/.libs/openssl |
| 98 | 98 | ||
| 99 | elif [ "x$ARCH" = "xandroid" ]; then | 99 | elif [ "x$ARCH" = "xandroid" ]; then |
| 100 | touch $HOME/.android/repositories.cfg | ||
| 100 | echo y | sdkmanager 'ndk-bundle' | 101 | echo y | sdkmanager 'ndk-bundle' |
| 102 | echo y | sdkmanager 'ndk;20.1.5948944' | ||
| 101 | echo y | sdkmanager 'cmake;3.6.4111459' | 103 | echo y | sdkmanager 'cmake;3.6.4111459' |
| 102 | echo y | sdkmanager 'lldb;3.0' | ||
| 103 | echo y | sdkmanager --update | ||
| 104 | echo y | sdkmanager --licenses | ||
| 105 | 104 | ||
| 106 | export CMAKE=$ANDROID_HOME/cmake/3.6.4111459/bin/cmake | 105 | export CMAKE=$ANDROID_HOME/cmake/3.6.4111459/bin/cmake |
| 107 | export NINJA=$ANDROID_HOME/cmake/3.6.4111459/bin/ninja | 106 | export NINJA=$ANDROID_HOME/cmake/3.6.4111459/bin/ninja |