Browse Source

Attempt fo fix #743 by pairing latest SDK tools /w latest build tools.
[ci only: Android]

Yao Wei Tjong 姚伟忠 10 years ago
parent
commit
6bd02fe805
1 changed files with 3 additions and 2 deletions
  1. 3 2
      .travis.yml

+ 3 - 2
.travis.yml

@@ -162,6 +162,7 @@ after_script: rake ci_teardown_cache
 
 
 branch: {name: Android-CI, active: yes, description: For Travis CI - switch CI build to use Android build environment.}
 branch: {name: Android-CI, active: yes, description: For Travis CI - switch CI build to use Android build environment.}
 language: android
 language: android
+android: {components: [build-tools-23.0.0_rc2]}
 cache: {directories: $HOME/.ccache}
 cache: {directories: $HOME/.ccache}
 sudo: false
 sudo: false
 addons: {apt: {sources: &default_sources george-edison55-precise-backports, packages: &default_packages [doxygen, graphviz, libasound2-dev, g++-multilib]}}
 addons: {apt: {sources: &default_sources george-edison55-precise-backports, packages: &default_packages [doxygen, graphviz, libasound2-dev, g++-multilib]}}
@@ -180,8 +181,8 @@ matrix:
   fast_finish: true
   fast_finish: true
   include:
   include:
     # x86 and x86_64 emulation currently requires hardware acceleration which Travis-CI cannot provide, so skip AVD for now
     # x86 and x86_64 emulation currently requires hardware acceleration which Travis-CI cannot provide, so skip AVD for now
-    # env: API=21 ABI=x86_64      URHO3D_LIB_TYPE=SHARED INSTALL=sys-img-x86_64-android-21,tools AVD=test_21_x86_64
-    # env: API=21 ABI=x86         URHO3D_LIB_TYPE=SHARED INSTALL=sys-img-x86-android-21,tools AVD=test_21_x86
+    # env: API=21 ABI=x86_64      URHO3D_LIB_TYPE=SHARED INSTALL=sys-img-x86_64-android-21,tools AVD=test_21_x86_64     USE_CCACHE=2
+    # env: API=21 ABI=x86         URHO3D_LIB_TYPE=SHARED INSTALL=sys-img-x86-android-21,tools AVD=test_21_x86           USE_CCACHE=2
 
 
     # Travis CI does not create one cache per job at the moment, so workaround it to have still high cache hit/miss ratio
     # Travis CI does not create one cache per job at the moment, so workaround it to have still high cache hit/miss ratio
     # We use jdk key as the cache storage differentiator! Our library is compiled using NDK so it should not be affected by JDK version
     # We use jdk key as the cache storage differentiator! Our library is compiled using NDK so it should not be affected by JDK version