diff options
| author | Leith Bade <leith@leithalweapon.geek.nz> | 2014-11-06 01:22:40 +1100 |
|---|---|---|
| committer | Leith Bade <leith@leithalweapon.geek.nz> | 2014-11-06 01:22:40 +1100 |
| commit | aebd3fdca56d7541784eb7f5ee3bd35dcd1d9288 (patch) | |
| tree | ea921eb72db6509d8d8cfc465574a394c1599647 | |
| parent | 18d5501279e17f5f93c4c450586f1c3ad29be316 (diff) | |
| download | qtlocation-mapboxgl-aebd3fdca56d7541784eb7f5ee3bd35dcd1d9288.tar.gz | |
Install android sdk
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | scripts/travis_before_install.sh | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index f76c9f0c03..bc3fddfabb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,9 @@ before_install: - source ./scripts/travis_helper.sh - source ./scripts/flags.sh - export ANDROID_NDK_PATH="$(pwd)/android-ndk-r10c" +- export NDK_HOME="$(pwd)/android-ndk-r10c" - export JAVA_HOME="$(pwd)/jdk1.7.0_71" +- export ANDROID_HOME="$(pwd)/android-sdk-linux" - ./scripts/travis_before_install.sh - if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then export LD_LIBRARY_PATH=`mason prefix mesa 10.3.1`/lib; fi - if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then glxinfo; fi diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh index 09818ee7a0..903a8f41b5 100755 --- a/scripts/travis_before_install.sh +++ b/scripts/travis_before_install.sh @@ -30,6 +30,18 @@ if [[ "${MASON_PLATFORM}" == "android" ]]; then echo "debug: unpacking JDK" #mapbox_time "unpacking JDK" \ tar -xzf ./jdk-7u71-linux-x64.tar.gz + + echo "debug: fetching SDK" + #mapbox_time "fetching SDK" \ + wget http://dl.google.com/android/android-sdk_r23.0.2-linux.tgz + + echo "debug: unpacking SDK" + #mapbox_time "unpacking SDK" \ + tar -xzf ./android-sdk_r23.0.2-linux.tgz + + echo "debug: installing SDK" + #mapbox_time "installing SDK" \ + echo y | ./android-sdk-linux/tools/android update sdk -u -a -t tools,platform-tools,build-tools-21.1.0,android-19 fi if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then |