Merge branch 'master' into matrix

2019-09-08 18:31:39 +02:00
parent b29c37eb25 87ce6df145
commit 50d49e47e7
215 changed files with 196355 additions and 163383 deletions
@@ -57,7 +57,7 @@ install:
    tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 &&
    tar -zxf android-sdk_r24.3.4-linux.tgz &&
    $ANDROID list sdk --extended -a &&
-    echo yes | $ANDROID update sdk -a -t tools,platform-tools,build-tools-23.0.1,android-10 --no-ui --force --no-https;
+    echo yes | $ANDROID update sdk -a -t tools,platform-tools,build-tools-23.0.1,android-23 --no-ui --force --no-https;
  fi
 - sudo python -m easy_install --upgrade pyOpenSSL
 - sudo pip install pyjavaproperties