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

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

Unified Diff: Makefile

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

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

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

Jump to:

Index: Makefile

diff --git a/Makefile b/Makefile

index 6ddfbf1f4556e97ef142063f37e7362d59ffa0b5..bb880e4c8887afda8f03a16c27e22b99e6603b96 100644

--- a/Makefile

+++ b/Makefile

@@ -2,7 +2,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_neon=0 armv7=0 arm_fpu=off vfp3=off arm_float_abi=default

René Jeschke 2015/01/29 14:22:22 The v8 version we upgraded to needs this value to

Felix Dahlke 2015/01/29 16:49:25 Can you add another += line for that, for 80 colum

René Jeschke 2015/01/29 17:07:53 Done.

TEST_EXECUTABLE = build/out/Debug/tests

@@ -35,7 +35,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 \

René Jeschke 2015/01/29 14:22:22 As we already require $ANDROID_NDK_ROOT to be defi

Felix Dahlke 2015/01/29 16:49:25 Yeah, I've got multiple NDK versions here, we real

BUILDTYPE=Release \

APP_PLATFORM=android-9 \

APP_STL=gnustl_static \

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