Unified Diff: Makefile
Issue 10488022:
Added Android build target (Closed)
Patch Set:
Created May 16, 2013, 10:23 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
common.gypi » ('j')
|
common.gypi » ('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 |
| @@ -1,13 +1,36 @@ |
| ARCH := x64 |
| -.PHONY: test |
| +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 |
| + |
| +.PHONY: all test clean v8_android android |
| all: |
| third_party/gyp/gyp --depth=. -f make -I common.gypi --generator-output=build -Dtarget_arch=$(ARCH) libadblockplus.gyp |
| $(MAKE) -C build |
| test: all |
| build/out/Debug/tests |
| clean: |
| $(RM) -r build |
| + |
| +v8_android: |
| + test -d third_party/v8/build/gyp || mkdir third_party/v8/build/gyp |
|
Wladimir Palant
2013/05/24 08:47:37
Heh, very obvious... I actually looked at man mkdi
|
| + cp -f third_party/v8_gyp_launcher third_party/v8/build/gyp/gyp |
|
Felix Dahlke
2013/05/23 13:35:44
How come this is only necessary for Android?
Wladimir Palant
2013/05/24 08:47:37
Normally we run our own gyp instance, we don't run
|
| + DEFINES="${ANDROID_PARAMETERS}" \ |
| + OUTDIR=../../build \ |
| + $(MAKE) -C third_party/v8 android_arm.release |
| + |
| +android: v8_android |
| + GYP_DEFINES="${ANDROID_PARAMETERS}" \ |
| + third_party/gyp/gyp --depth=. -f make -I common.gypi --generator-output=build -Gandroid_ndk_version=r8e libadblockplus.gyp |
| + ndk-build -C build installed_modules \ |
| + BUILDTYPE=Release \ |
| + APP_PLATFORM=android-9 \ |
|
Wladimir Palant
2013/05/16 12:06:26
This is pretty random - I simply chose it because
Felix Dahlke
2013/05/23 13:35:44
I think this should be the same as our minSdkVersi
|
| + APP_STL=gnustl_static \ |
| + APP_BUILD_SCRIPT=Makefile \ |
| + NDK_PROJECT_PATH=. \ |
| + NDK_OUT=. \ |
| + NDK_APP_DST_DIR=android_arm.release |
