Side by Side Diff: Makefile
Issue 10488022:
Added Android build target (Closed)
Patch Set:
Created May 16, 2013, 10:23 a.m.
| Left: | ||
| Right: |
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')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 ARCH := x64 | 1 ARCH := x64 |
| 2 | 2 |
| 3 .PHONY: test | 3 ANDROID_PARAMETERS = target_arch=arm OS=android |
| 4 ANDROID_PARAMETERS += android_target_arch=arm | |
| 5 ANDROID_PARAMETERS += arm_neon=0 armv7=0 arm_fpu=off vfp3=off | |
| 6 | |
| 7 .PHONY: all test clean v8_android android | |
| 4 | 8 |
| 5 all: | 9 all: |
| 6 third_party/gyp/gyp --depth=. -f make -I common.gypi --generator-output= build -Dtarget_arch=$(ARCH) libadblockplus.gyp | 10 third_party/gyp/gyp --depth=. -f make -I common.gypi --generator-output= build -Dtarget_arch=$(ARCH) libadblockplus.gyp |
| 7 $(MAKE) -C build | 11 $(MAKE) -C build |
| 8 | 12 |
| 9 test: all | 13 test: all |
| 10 build/out/Debug/tests | 14 build/out/Debug/tests |
| 11 | 15 |
| 12 clean: | 16 clean: |
| 13 $(RM) -r build | 17 $(RM) -r build |
| 18 | |
| 19 v8_android: | |
| 20 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
| |
| 21 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
| |
| 22 DEFINES="${ANDROID_PARAMETERS}" \ | |
| 23 OUTDIR=../../build \ | |
| 24 $(MAKE) -C third_party/v8 android_arm.release | |
| 25 | |
| 26 android: v8_android | |
| 27 GYP_DEFINES="${ANDROID_PARAMETERS}" \ | |
| 28 third_party/gyp/gyp --depth=. -f make -I common.gypi --generator-output= build -Gandroid_ndk_version=r8e libadblockplus.gyp | |
| 29 ndk-build -C build installed_modules \ | |
| 30 BUILDTYPE=Release \ | |
| 31 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
| |
| 32 APP_STL=gnustl_static \ | |
| 33 APP_BUILD_SCRIPT=Makefile \ | |
| 34 NDK_PROJECT_PATH=. \ | |
| 35 NDK_OUT=. \ | |
| 36 NDK_APP_DST_DIR=android_arm.release | |
| OLD | NEW |
