Unified Diff: Makefile
Issue 5708936187478016:
Issue 1906 - Fix broken Android build (Closed)
Patch Set: Fixed some formatting issues, shared_ptr.reset()
Created Jan. 29, 2015, 5:07 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
libadblockplus.gyp » ('j')
|
no next file with comments »
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 6ddfbf1f4556e97ef142063f37e7362d59ffa0b5..e0f1f2fe0db325fc290094a103c1ea3d0991f05b 100644 |
| --- a/Makefile |
| +++ b/Makefile |
| @@ -3,6 +3,7 @@ ARCH := x64 |
| ANDROID_PARAMETERS = target_arch=arm OS=android |
| ANDROID_PARAMETERS += android_target_arch=arm |
| ANDROID_PARAMETERS += arm_neon=0 armv7=0 arm_fpu=off vfp3=off |
| +ANDROID_PARAMETERS += arm_float_abi=default |
| TEST_EXECUTABLE = build/out/Debug/tests |
| @@ -35,7 +36,7 @@ v8_android: |
| 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 \ |
| + $(ANDROID_NDK_ROOT)/ndk-build -C build installed_modules \ |
| BUILDTYPE=Release \ |
| APP_PLATFORM=android-9 \ |
| APP_STL=gnustl_static \ |
« no previous file with comments
|
« no previous file
|
libadblockplus.gyp » ('j')
|
no next file with comments »
