Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: .travis.yml

Issue 29748587: Issue 6063, 6531 - Update V8 to 6.5.254.41, use C++14 and NDK-r16b (Closed) Base URL: https://github.com/adblockplus/libadblockplus@549616e865707b89e95659d55c70e22d63130ce5
Patch Set: fix and simplify build for Windows Created April 18, 2018, 6:41 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Makefile » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: .travis.yml
diff --git a/.travis.yml b/.travis.yml
index 074016ce416202d83bfeba03b3a2ae03267a46a5..20e3d333e27eaf143e866fa2f1ea3d6366e74c21 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,12 +22,12 @@ python: '2.7'
env:
global:
- - URL_PREFIX=https://v8.eyeofiles.com/v8-9a4991959e231351e52266b631cbd36f8341bdc3/
+ - URL_PREFIX=https://v8.eyeofiles.com/v8-3cdaf01c4043e19965efc5ef48df5314960b898f/
matrix:
- BUILD_ACTION=test
- - BUILD_ACTION=android_arm ANDROID_NDK_ROOT=${TRAVIS_BUILD_DIR}/third_party/android-ndk-r12b
- - BUILD_ACTION=android_x86 ANDROID_NDK_ROOT=${TRAVIS_BUILD_DIR}/third_party/android-ndk-r12b
- - BUILD_ACTION=android_arm64 ANDROID_NDK_ROOT=${TRAVIS_BUILD_DIR}/third_party/android-ndk-r12b
+ - BUILD_ACTION=android_arm ANDROID_NDK_ROOT=${TRAVIS_BUILD_DIR}/third_party/android-ndk-r16b
+ - BUILD_ACTION=android_x86 ANDROID_NDK_ROOT=${TRAVIS_BUILD_DIR}/third_party/android-ndk-r16b
+ - BUILD_ACTION=android_arm64 ANDROID_NDK_ROOT=${TRAVIS_BUILD_DIR}/third_party/android-ndk-r16b
before_script:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
@@ -36,8 +36,8 @@ before_script:
- bash .travis/prepare-prebuilt-v8.sh
- sed -i.bak '/third_party\/v8/d' dependencies
- ./ensure_dependencies.py
- - if [[ -n "$ANDROID_NDK_ROOT" && "$TRAVIS_OS_NAME" == "linux" ]]; then wget https://dl.google.com/android/repository/android-ndk-r12b-linux-x86_64.zip -O third_party/android-ndk.zip ; fi
- - if [[ -n "$ANDROID_NDK_ROOT" && "$TRAVIS_OS_NAME" == "osx" ]]; then wget https://dl.google.com/android/repository/android-ndk-r12b-darwin-x86_64.zip -O third_party/android-ndk.zip ; fi
+ - if [[ -n "$ANDROID_NDK_ROOT" && "$TRAVIS_OS_NAME" == "linux" ]]; then wget https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip -O third_party/android-ndk.zip ; fi
+ - if [[ -n "$ANDROID_NDK_ROOT" && "$TRAVIS_OS_NAME" == "osx" ]]; then wget https://dl.google.com/android/repository/android-ndk-r16b-darwin-x86_64.zip -O third_party/android-ndk.zip ; fi
- if [[ -n "$ANDROID_NDK_ROOT" ]]; then unzip -q third_party/android-ndk.zip -d third_party/ ; fi
script:
« no previous file with comments | « no previous file | Makefile » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld