travis: download ndk from google instead of cloning custom one, rename install to before_install

This commit is contained in:
rafal1137 2020-04-30 22:00:40 +02:00
parent 18f84bf67c
commit 8624218e0a

View file

@ -9,8 +9,6 @@ android:
- tools - tools
- platform-tools - platform-tools
- android-26 - android-26
- cmake
- ndk-bundle
before_cache: before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
- rm -rf $HOME/.gradle/caches/*/plugin-resolution/ - rm -rf $HOME/.gradle/caches/*/plugin-resolution/
@ -25,14 +23,17 @@ licenses:
- 'google-gdk-license-.+' - 'google-gdk-license-.+'
before_script: before_script:
- sudo chmod +x gradlew - sudo chmod +x gradlew
- git clone https://github.com/rafal1137/NDK_ETL.git - wget https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip
- export ANDROID_NDK_HOME=$HOME/NDK_ETL/ndk-bundle - unzip android-ndk-r16b-linux-x86_64.zip -d $HOME
- export PATH=$PATH:$ANDROID_NDK_HOME - export ANDROID_NDK_HOME=$HOME/android-ndk-r16b
#- git clone https://github.com/rafal1137/NDK_ETL.git
#- export ANDROID_NDK_HOME=$HOME/NDK_ETL/ndk-bundle
#- export PATH=$PATH:$ANDROID_NDK_HOME
- echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > "$ANDROID_HOME/licenses/android-sdk-license" - echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > "$ANDROID_HOME/licenses/android-sdk-license"
#install: before_install:
# - echo y | $HOME/android-sdk/tools/bin/sdkmanager "platforms;android-26" > /dev/null - echo y | sdkmanager "platforms;android-26" > /dev/null
# - echo y | sdkmanager "ndk-bundle" - echo y | sdkmanager "ndk-bundle"
# - echo y | sdkmanager "ndk;16.1.4479499" - echo y | sdkmanager "ndk;16.1.4479499"
# - echo y | sdkmanager "cmake;3.10.2.4988404" - echo y | sdkmanager "cmake;3.10.2.4988404"
script: script:
- ./gradlew --stacktrace assembleDebug - ./gradlew --stacktrace assembleDebug