diff options
| author | Cody Northrop <cnorthrop@google.com> | 2017-10-12 20:44:23 -0600 |
|---|---|---|
| committer | Cody Northrop <cnorthrop@google.com> | 2017-11-03 16:03:59 -0600 |
| commit | d1af17bfd7512532adc29a05ca4c519df29003fc (patch) | |
| tree | bab049fc62d66096d70f884f31f2ad9eb44cdff0 /.travis.yml | |
| parent | 1b1a1606095c171d25e9f5485f79a3a17e00a189 (diff) | |
| download | vulkan-tools-d1af17bfd7512532adc29a05ca4c519df29003fc.tar.gz | |
travis: Switch to ccache, skip Android toolchain build
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 5f0451fb..a9ff353f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,10 +33,7 @@ android: - build-tools-23.0.2 - android-23 -cache: - directories: - - external - - build-android/external +cache: ccache before_install: # Install the appropriate Linux packages. @@ -59,9 +56,9 @@ script: - if [[ "$VULKAN_BUILD_TARGET" == "LINUX" ]]; then make -C dbuild; fi - if [[ "$VULKAN_BUILD_TARGET" == "LINUX" ]]; then LD_LIBRARY_PATH=dbuild/loader:$LD_LIBRARY_PATH VK_LAYER_PATH=dbuild/layers VK_ICD_FILENAMES=dbuild/icd/VkICD_mock_icd.json dbuild/tests/vk_layer_validation_tests; fi - if [[ "$VULKAN_BUILD_TARGET" == "ANDROID" ]]; then pushd build-android; fi - - if [[ "$VULKAN_BUILD_TARGET" == "ANDROID" ]]; then ./update_external_sources_android.sh --abi $ANDROID_ABI; fi + - if [[ "$VULKAN_BUILD_TARGET" == "ANDROID" ]]; then ./update_external_sources_android.sh --abi $ANDROID_ABI --no-build; fi - if [[ "$VULKAN_BUILD_TARGET" == "ANDROID" ]]; then ./android-generate.sh; fi - - if [[ "$VULKAN_BUILD_TARGET" == "ANDROID" ]]; then ndk-build APP_ABI=$ANDROID_ABI; fi + - if [[ "$VULKAN_BUILD_TARGET" == "ANDROID" ]]; then USE_CCACHE=1 NDK_CCACHE=/usr/lib/ccache ndk-build APP_ABI=$ANDROID_ABI; fi - if [[ "$VULKAN_BUILD_TARGET" == "ANDROID" ]]; then popd; fi notifications: |