Merge pull request #547 from owncloud/fix_Android_SDK_license_agreement_in_Travis_build

Agreed new Android SDK license for updated platform tools

diff --git a/.travis.yml b/.travis.yml
index 4429520..d205021 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,9 +3,10 @@ jdk: oraclejdk7
 before_install:
   # Install base Android SDK
     - sudo apt-get update -qq
-    - sudo apt-get install -qq libstdc++6:i386 lib32z1
-    - export COMPONENTS=build-tools-18.1.0,android-14,android-17,android-19,sysimg-19,extra-android-support
-    - curl -3L https://raw.github.com/embarkmobile/android-sdk-installer/version-1/android-sdk-installer | bash /dev/stdin --install=$COMPONENTS
+    - sudo apt-get install -qq libstdc++6:i386 lib32z1 expect
+    - export COMPONENTS="build-tools-20.0.0,android-14,android-17,android-19,sysimg-19,extra-android-support"
+    - export LICENSES="android-sdk-license-5be876d5|android-sdk-license-598b93a6"
+    - curl -3L https://raw.github.com/embarkmobile/android-sdk-installer/version-2/android-sdk-installer | bash /dev/stdin --install=$COMPONENTS --accept=$LICENSES
     - source ~/.android-sdk-installer/env
     - rm pom.xml
     - ./setup_env.sh