Left: | ||
Right: |
OLD | NEW |
---|---|
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 Loading... | |
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" \ | |
sergei
2018/04/10 13:56:48
These two parameters are required to link our exec
hub
2018/04/11 01:57:41
I'll be mindful when I rebase my patch
| |
141 NDK_APP_DST_DIR=$(ANDROID_DEST_DIR) | 143 NDK_APP_DST_DIR=$(ANDROID_DEST_DIR) |
142 endif | 144 endif |
143 | 145 |
OLD | NEW |