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

Side by Side Diff: Makefile

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.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « .travis.yml ('k') | android-v8-options.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 V8_DIR :=$(shell pwd -L)/third_party/v8/ 1 V8_DIR :=$(shell pwd -L)/third_party/v8/
2 HOST_ARCH :=$(shell python third_party/detect_v8_host_arch.py) 2 HOST_ARCH :=$(shell python third_party/detect_v8_host_arch.py)
3 3
4 GYP_PARAMETERS=host_arch=${HOST_ARCH} 4 GYP_PARAMETERS=host_arch=${HOST_ARCH}
5 5
6 ifndef HOST_OS 6 ifndef HOST_OS
7 raw_OS = $(shell uname -s) 7 raw_OS = $(shell uname -s)
8 ifeq (${raw_OS},Linux) 8 ifeq (${raw_OS},Linux)
9 HOST_OS=linux 9 HOST_OS=linux
10 else ifeq (${raw_OS},Darwin) 10 else ifeq (${raw_OS},Darwin)
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 v8_android_multi_mac_arm: v8_android_multi 121 v8_android_multi_mac_arm: v8_android_multi
122 find ${BUILD_DIR}/android_arm.release/ -depth 1 -iname \*.a -exec ${ANDR OID_NDK_ROOT}/toolchains/arm-linux-androideabi-4.9/prebuilt/darwin-x86_64/bin/ar m-linux-androideabi-ranlib {} \; 122 find ${BUILD_DIR}/android_arm.release/ -depth 1 -iname \*.a -exec ${ANDR OID_NDK_ROOT}/toolchains/arm-linux-androideabi-4.9/prebuilt/darwin-x86_64/bin/ar m-linux-androideabi-ranlib {} \;
123 123
124 v8_android_multi_mac_arm64: v8_android_multi 124 v8_android_multi_mac_arm64: v8_android_multi
125 find ${BUILD_DIR}/android_arm64.release/ -depth 1 -iname \*.a -exec ${AN DROID_NDK_ROOT}/toolchains/aarch64-linux-android-4.9/prebuilt/darwin-x86_64/bin/ aarch64-linux-android-ranlib {} \; 125 find ${BUILD_DIR}/android_arm64.release/ -depth 1 -iname \*.a -exec ${AN DROID_NDK_ROOT}/toolchains/aarch64-linux-android-4.9/prebuilt/darwin-x86_64/bin/ aarch64-linux-android-ranlib {} \;
126 126
127 build-v8-android: v8_android_multi_${HOST_OS}_${ANDROID_ARCH} 127 build-v8-android: v8_android_multi_${HOST_OS}_${ANDROID_ARCH}
128 128
129 android_multi: ${BUILD_V8} ensure_dependencies 129 android_multi: ${BUILD_V8} ensure_dependencies
130 GYP_DEFINES="${GYP_PARAMETERS} ${ABP_GYP_PARAMETERS}" \ 130 GYP_DEFINES="${GYP_PARAMETERS} ${ABP_GYP_PARAMETERS}" \
131 » python ./make_gyp_wrapper.py --depth=. -f make-android -Ilibadblockplus. gypi --generator-output=${BUILD_DIR} -Gandroid_ndk_version=r12b libadblockplus.g yp 131 » python ./make_gyp_wrapper.py --depth=. -f make-android -Ilibadblockplus. gypi --generator-output=${BUILD_DIR} -Gandroid_ndk_version=r16b libadblockplus.g yp
132 $(ANDROID_NDK_ROOT)/ndk-build -C ${BUILD_DIR} installed_modules \ 132 $(ANDROID_NDK_ROOT)/ndk-build -C ${BUILD_DIR} installed_modules \
133 BUILDTYPE=Release \ 133 BUILDTYPE=Release \
134 APP_ABI=$(ANDROID_ABI) \ 134 APP_ABI=$(ANDROID_ABI) \
135 APP_PLATFORM=${ANDROID_PLATFORM_LEVEL} \ 135 APP_PLATFORM=${ANDROID_PLATFORM_LEVEL} \
136 APP_PIE=true \ 136 APP_PIE=true \
137 APP_STL=c++_static \ 137 APP_STL=c++_static \
138 APP_BUILD_SCRIPT=Makefile \ 138 APP_BUILD_SCRIPT=Makefile \
139 NDK_PROJECT_PATH=. \ 139 NDK_PROJECT_PATH=. \
140 NDK_OUT=. \ 140 NDK_OUT=. \
141 LOCAL_DISABLE_FATAL_LINKER_WARNINGS=true \
142 LOCAL_LDFLAGS="-Wl,--allow-multiple-definition" \
141 NDK_APP_DST_DIR=$(ANDROID_DEST_DIR) 143 NDK_APP_DST_DIR=$(ANDROID_DEST_DIR)
142 endif 144 endif
143 145
OLDNEW
« no previous file with comments | « .travis.yml ('k') | android-v8-options.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld