Unified Diff: Makefile
Issue 5163715573841920:
Issue 768 - Switch from TR1 to C++11 (Closed)
Patch Set:
Created July 11, 2014, 2:24 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« .hgsubstate ('K')
|
« .hgsubstate ('k')
|
common.gypi » ('j')
|
include/AdblockPlus/FilterEngine.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: Makefile |
| =================================================================== |
| --- a/Makefile |
| +++ b/Makefile |
| @@ -30,13 +30,14 @@ v8_android: |
| $(MAKE) -C third_party/v8 android_arm.release |
| android: v8_android |
| GYP_DEFINES="${ANDROID_PARAMETERS}" \ |
| third_party/gyp/gyp --depth=. -f make-android -I common.gypi --generator-output=build -Gandroid_ndk_version=r9 libadblockplus.gyp |
| ndk-build -C build installed_modules \ |
| BUILDTYPE=Release \ |
| APP_PLATFORM=android-9 \ |
| - APP_STL=gnustl_static \ |
| + APP_STL=c++_static \ |
| APP_BUILD_SCRIPT=Makefile \ |
| + NDK_TOOLCHAIN_VERSION=clang3.4 \ |
| NDK_PROJECT_PATH=. \ |
| NDK_OUT=. \ |
| NDK_APP_DST_DIR=android_arm.release |
« .hgsubstate ('K')
|
« .hgsubstate ('k')
|
common.gypi » ('j')
|
include/AdblockPlus/FilterEngine.h » ('J')
