Unified 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:
Created April 10, 2018, 1:45 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
README.md » ('j')
|
dependencies » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: Makefile |
| diff --git a/Makefile b/Makefile |
| index 80bc449246c656b470eace7a5b79bf10b253138d..a8193dbe5ea990f66e2aa18a674d21c1a78aa429 100644 |
| --- a/Makefile |
| +++ b/Makefile |
| @@ -128,7 +128,7 @@ build-v8-android: v8_android_multi_${HOST_OS}_${ANDROID_ARCH} |
| android_multi: ${BUILD_V8} ensure_dependencies |
| GYP_DEFINES="${GYP_PARAMETERS} ${ABP_GYP_PARAMETERS}" \ |
| - python ./make_gyp_wrapper.py --depth=. -f make-android -Ilibadblockplus.gypi --generator-output=${BUILD_DIR} -Gandroid_ndk_version=r12b libadblockplus.gyp |
| + python ./make_gyp_wrapper.py --depth=. -f make-android -Ilibadblockplus.gypi --generator-output=${BUILD_DIR} -Gandroid_ndk_version=r16b libadblockplus.gyp |
| $(ANDROID_NDK_ROOT)/ndk-build -C ${BUILD_DIR} installed_modules \ |
| BUILDTYPE=Release \ |
| APP_ABI=$(ANDROID_ABI) \ |
| @@ -138,6 +138,8 @@ android_multi: ${BUILD_V8} ensure_dependencies |
| APP_BUILD_SCRIPT=Makefile \ |
| NDK_PROJECT_PATH=. \ |
| NDK_OUT=. \ |
| + LOCAL_DISABLE_FATAL_LINKER_WARNINGS=true \ |
| + 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
|
| NDK_APP_DST_DIR=$(ANDROID_DEST_DIR) |
| endif |
