Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: Makefile

Issue 10488022: Added Android build target (Closed)
Left Patch Set: Created May 16, 2013, 10:23 a.m.
Right Patch Set: Review comments addressed Created May 24, 2013, 8:40 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | common.gypi » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 ARCH := x64 1 ARCH := x64
2 2
3 ANDROID_PARAMETERS = target_arch=arm OS=android 3 ANDROID_PARAMETERS = target_arch=arm OS=android
4 ANDROID_PARAMETERS += android_target_arch=arm 4 ANDROID_PARAMETERS += android_target_arch=arm
5 ANDROID_PARAMETERS += arm_neon=0 armv7=0 arm_fpu=off vfp3=off 5 ANDROID_PARAMETERS += arm_neon=0 armv7=0 arm_fpu=off vfp3=off
6 6
7 .PHONY: all test clean v8_android android 7 .PHONY: all test clean v8_android android
8 8
9 all: 9 all:
10 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
11 $(MAKE) -C build 11 $(MAKE) -C build
12 12
13 test: all 13 test: all
14 build/out/Debug/tests 14 build/out/Debug/tests
15 15
16 clean: 16 clean:
17 $(RM) -r build 17 $(RM) -r build
18 18
19 v8_android: 19 v8_android:
20 » test -d third_party/v8/build/gyp || mkdir third_party/v8/build/gyp 20 » mkdir -p 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 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}" \ 22 DEFINES="${ANDROID_PARAMETERS}" \
23 OUTDIR=../../build \ 23 OUTDIR=../../build \
24 $(MAKE) -C third_party/v8 android_arm.release 24 $(MAKE) -C third_party/v8 android_arm.release
25 25
26 android: v8_android 26 android: v8_android
27 GYP_DEFINES="${ANDROID_PARAMETERS}" \ 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 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 \ 29 ndk-build -C build installed_modules \
30 BUILDTYPE=Release \ 30 BUILDTYPE=Release \
31 APP_PLATFORM=android-9 \ 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 \ 32 APP_STL=gnustl_static \
33 APP_BUILD_SCRIPT=Makefile \ 33 APP_BUILD_SCRIPT=Makefile \
34 NDK_PROJECT_PATH=. \ 34 NDK_PROJECT_PATH=. \
35 NDK_OUT=. \ 35 NDK_OUT=. \
36 NDK_APP_DST_DIR=android_arm.release 36 NDK_APP_DST_DIR=android_arm.release
LEFTRIGHT
« no previous file | common.gypi » ('j') | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld