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

Unified Diff: .travis/prepare-prebuilt-v8.sh

Issue 29783566: Issue 6596 - update to work with v8 6.7.288.11 (Closed) Base URL: https://github.com/adblockplus/libadblockplus@99836840e314b7941fdb51cb2b91f23ca3ee3414
Patch Set: Created May 16, 2018, 10:17 a.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 | « .travis.yml ('k') | Makefile » ('j') | README.md » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: .travis/prepare-prebuilt-v8.sh
diff --git a/.travis/prepare-prebuilt-v8.sh b/.travis/prepare-prebuilt-v8.sh
index c07852fa47e76ddadd7914daa56f52ed1071ef24..9c5a3d8df0f248af579201d81655f501b2129d68 100644
--- a/.travis/prepare-prebuilt-v8.sh
+++ b/.travis/prepare-prebuilt-v8.sh
@@ -6,16 +6,12 @@ set -e
wget ${URL_PREFIX}include.7z -O third_party/v8-include.7z
7z x third_party/v8-include.7z -othird_party/prebuilt-v8
-if [[ "${BUILD_ACTION}" = "android_arm" ]]; then
-PREBUILT_V8_ARCHIVE=android-arm-release.tar.xz
-elif [[ "${BUILD_ACTION}" = "android_arm64" ]]; then
-PREBUILT_V8_ARCHIVE=android-arm64-release.tar.xz
-elif [[ "${BUILD_ACTION}" = "android_x86" ]]; then
-PREBUILT_V8_ARCHIVE=android-x86-release.tar.xz
-else
-if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+PREBUILT_V8_ARCHIVE=${TARGET_OS}-${TARGET_ARCH}-${Configuration}.tar.xz
+
+if [[ "${TARGET_OS}" != "android" ]]; then
+if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
PREBUILT_V8_ARCHIVE=osx-x64-debug.tar.xz
-else
+elif [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
PREBUILT_V8_ARCHIVE=u14.04-x64-debug.tar.xz
fi
fi
« no previous file with comments | « .travis.yml ('k') | Makefile » ('j') | README.md » ('J')

Powered by Google App Engine
This is Rietveld