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

Side by Side Diff: Makefile

Issue 29511621: Noissue - fix the value of gyp -Gandroid_ndk_version parameter in accordance to the used Android NDK (Closed) Base URL: https://github.com/adblockplus/libadblockplus.git
Patch Set: add 'r' Created Aug. 10, 2017, 1:50 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 | « no previous file | no next file » | 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 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 v8_android_multi_mac_arm: v8_android_multi 117 v8_android_multi_mac_arm: v8_android_multi
118 find build/android_arm.release/ -depth 1 -iname \*.a -exec ${ANDROID_NDK _ROOT}/toolchains/arm-linux-androideabi-4.9/prebuilt/darwin-x86_64/bin/arm-linux -androideabi-ranlib {} \; 118 find build/android_arm.release/ -depth 1 -iname \*.a -exec ${ANDROID_NDK _ROOT}/toolchains/arm-linux-androideabi-4.9/prebuilt/darwin-x86_64/bin/arm-linux -androideabi-ranlib {} \;
119 119
120 v8_android_multi_mac_arm64: v8_android_multi 120 v8_android_multi_mac_arm64: v8_android_multi
121 find build/android_arm64.release/ -depth 1 -iname \*.a -exec ${ANDROID_N DK_ROOT}/toolchains/aarch64-linux-android-4.9/prebuilt/darwin-x86_64/bin/aarch64 -linux-android-ranlib {} \; 121 find build/android_arm64.release/ -depth 1 -iname \*.a -exec ${ANDROID_N DK_ROOT}/toolchains/aarch64-linux-android-4.9/prebuilt/darwin-x86_64/bin/aarch64 -linux-android-ranlib {} \;
122 122
123 build-v8-android: v8_android_multi_${HOST_OS}_${ANDROID_ARCH} 123 build-v8-android: v8_android_multi_${HOST_OS}_${ANDROID_ARCH}
124 124
125 android_multi: ${BUILD_V8} ensure_dependencies 125 android_multi: ${BUILD_V8} ensure_dependencies
126 GYP_DEFINES="${GYP_PARAMETERS} ${ABP_GYP_PARAMETERS}" \ 126 GYP_DEFINES="${GYP_PARAMETERS} ${ABP_GYP_PARAMETERS}" \
127 » python ./make_gyp_wrapper.py --depth=. -f make-android -Ilibadblockplus. gypi --generator-output=build -Gandroid_ndk_version=r9 libadblockplus.gyp 127 » python ./make_gyp_wrapper.py --depth=. -f make-android -Ilibadblockplus. gypi --generator-output=build -Gandroid_ndk_version=r12b libadblockplus.gyp
128 $(ANDROID_NDK_ROOT)/ndk-build -C build installed_modules \ 128 $(ANDROID_NDK_ROOT)/ndk-build -C build installed_modules \
129 BUILDTYPE=Release \ 129 BUILDTYPE=Release \
130 APP_ABI=$(ANDROID_ABI) \ 130 APP_ABI=$(ANDROID_ABI) \
131 APP_PLATFORM=${ANDROID_PLATFORM_LEVEL} \ 131 APP_PLATFORM=${ANDROID_PLATFORM_LEVEL} \
132 APP_PIE=true \ 132 APP_PIE=true \
133 APP_STL=c++_static \ 133 APP_STL=c++_static \
134 APP_BUILD_SCRIPT=Makefile \ 134 APP_BUILD_SCRIPT=Makefile \
135 NDK_PROJECT_PATH=. \ 135 NDK_PROJECT_PATH=. \
136 NDK_OUT=. \ 136 NDK_OUT=. \
137 NDK_APP_DST_DIR=$(ANDROID_DEST_DIR) 137 NDK_APP_DST_DIR=$(ANDROID_DEST_DIR)
138 endif 138 endif
139 139
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld