Makefile - Issue 5708936187478016: Issue 1906 - Fix broken Android build

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments.

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Side by Side Diff: Makefile

Issue 5708936187478016: Issue 1906 - Fix broken Android build (Closed)

Patch Set: Created Jan. 29, 2015, 2:16 p.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View unified diff | Download patch

OLD	NEW
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 arm_float_abi=defa ult
	René Jeschke 2015/01/29 14:22:22 The v8 version we upgraded to needs this value to The v8 version we upgraded to needs this value to be defined now. Felix Dahlke 2015/01/29 16:49:25 Can you add another += line for that, for 80 colum Show quoted text On 2015/01/29 14:22:22, René Jeschke wrote: > The v8 version we upgraded to needs this value to be defined now. Can you add another += line for that, for 80 column goodness? :) René Jeschke 2015/01/29 17:07:53 Done. Show quoted text On 2015/01/29 16:49:25, Felix H. Dahlke wrote: > On 2015/01/29 14:22:22, René Jeschke wrote: > > The v8 version we upgraded to needs this value to be defined now. > > Can you add another += line for that, for 80 column goodness? :) Done.
6	6

7 TEST_EXECUTABLE = build/out/Debug/tests	7 TEST_EXECUTABLE = build/out/Debug/tests

8	8

9 .PHONY: all test clean v8_android android docs	9 .PHONY: all test clean v8_android android docs

10	10

11 all:	11 all:

12 third_party/gyp/gyp --depth=. -f make -I common.gypi --generator-output= build -Dtarget_arch=$(ARCH) libadblockplus.gyp	12 third_party/gyp/gyp --depth=. -f make -I common.gypi --generator-output= build -Dtarget_arch=$(ARCH) libadblockplus.gyp

13 $(MAKE) -C build	13 $(MAKE) -C build

14	14

15 test: all	15 test: all

(...skipping 12 matching lines...) Expand all Loading...
28 v8_android:	28 v8_android:

29 mkdir -p third_party/v8/build/gyp	29 mkdir -p third_party/v8/build/gyp

30 cp -f third_party/v8_gyp_launcher third_party/v8/build/gyp/gyp	30 cp -f third_party/v8_gyp_launcher third_party/v8/build/gyp/gyp

31 DEFINES="${ANDROID_PARAMETERS}" \	31 DEFINES="${ANDROID_PARAMETERS}" \

32 OUTDIR=../../build \	32 OUTDIR=../../build \

33 $(MAKE) -C third_party/v8 android_arm.release	33 $(MAKE) -C third_party/v8 android_arm.release

34	34

35 android: v8_android	35 android: v8_android

36 GYP_DEFINES="${ANDROID_PARAMETERS}" \	36 GYP_DEFINES="${ANDROID_PARAMETERS}" \

37 third_party/gyp/gyp --depth=. -f make-android -I common.gypi --generator -output=build -Gandroid_ndk_version=r9 libadblockplus.gyp	37 third_party/gyp/gyp --depth=. -f make-android -I common.gypi --generator -output=build -Gandroid_ndk_version=r9 libadblockplus.gyp

38 » ndk-build -C build installed_modules \	38 » $(ANDROID_NDK_ROOT)/ndk-build -C build installed_modules \
	René Jeschke 2015/01/29 14:22:22 As we already require $ANDROID_NDK_ROOT to be defi As we already require $ANDROID_NDK_ROOT to be defined, I removed the need to either have the NDK on the PATH or to symlink 'ndk-build' into '~/bin' (which now fails anyway). Felix Dahlke 2015/01/29 16:49:25 Yeah, I've got multiple NDK versions here, we real Show quoted text On 2015/01/29 14:22:22, René Jeschke wrote: > As we already require $ANDROID_NDK_ROOT to be defined, I removed the need to > either have the NDK on the PATH or to symlink 'ndk-build' into '~/bin' (which > now fails anyway). > Yeah, I've got multiple NDK versions here, we really shouldn't rely on it being on the PATH.
39 BUILDTYPE=Release \	39 BUILDTYPE=Release \

40 APP_PLATFORM=android-9 \	40 APP_PLATFORM=android-9 \

41 APP_STL=gnustl_static \	41 APP_STL=gnustl_static \

42 APP_BUILD_SCRIPT=Makefile \	42 APP_BUILD_SCRIPT=Makefile \

43 NDK_PROJECT_PATH=. \	43 NDK_PROJECT_PATH=. \

44 NDK_OUT=. \	44 NDK_OUT=. \

45 NDK_APP_DST_DIR=android_arm.release	45 NDK_APP_DST_DIR=android_arm.release

OLD	NEW

« no previous file with comments | « no previous file | libadblockplus.gyp » ('j') | libadblockplus.gyp » ('J')