Makefile - Issue 29329913: Issue 3296 - Enable ia32/x86 Android builds

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

Delta Between Two Patch Sets: Makefile

Issue 29329913: Issue 3296 - Enable ia32/x86 Android builds (Closed)

Left Patch Set: Created Nov. 10, 2015, 11:39 a.m.

Right Patch Set: Column alignment, moved a var def Created Nov. 10, 2015, 11:55 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

LEFT	RIGHT
1 ARCH := x64	1 ARCH := x64

2	2

	3 ANDROID_PARAMETERS = OS=android

3 ifneq ($(ANDROID_ARCH),)	4 ifneq ($(ANDROID_ARCH),)

4 ANDROID_PARAMETERS = OS=android
Felix Dahlke 2015/11/10 11:50:46 No column aligning please :D Also, not having anyt No column aligning please :D Also, not having anything to do with ANDROID_ARCH, I suppose this could move out of the condition. René Jeschke 2015/11/10 11:55:53 Done. Show quoted text On 2015/11/10 11:50:46, Felix Dahlke wrote: > No column aligning please :D Also, not having anything to do with ANDROID_ARCH, > I suppose this could move out of the condition. Done.
5 ifeq ($(ANDROID_ARCH),arm)	5 ifeq ($(ANDROID_ARCH),arm)

6 ANDROID_PARAMETERS += target_arch=arm android_target_arch=arm	6 ANDROID_PARAMETERS += target_arch=arm android_target_arch=arm

7 ANDROID_PARAMETERS += arm_neon=0 armv7=0 arm_fpu=off vfp3=off	7 ANDROID_PARAMETERS += arm_neon=0 armv7=0 arm_fpu=off vfp3=off

8 ANDROID_PARAMETERS += arm_float_abi=default	8 ANDROID_PARAMETERS += arm_float_abi=default

9 ANDROID_ABI = armeabi-v7a	9 ANDROID_ABI = armeabi-v7a

10 else ifeq ($(ANDROID_ARCH),ia32)	10 else ifeq ($(ANDROID_ARCH),ia32)

11 ANDROID_PARAMETERS += target_arch=x86 android_target_arch=x86	11 ANDROID_PARAMETERS += target_arch=x86 android_target_arch=x86

12 ANDROID_ABI = x86	12 ANDROID_ABI = x86

13 else	13 else

14 $(error "Unsupported Android architecture: $(ANDROID_ARCH))	14 $(error "Unsupported Android architecture: $(ANDROID_ARCH))

(...skipping 45 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
60 APP_ABI=$(ANDROID_ABI) \	60 APP_ABI=$(ANDROID_ABI) \

61 APP_PLATFORM=android-9 \	61 APP_PLATFORM=android-9 \

62 APP_STL=c++_static \	62 APP_STL=c++_static \

63 APP_BUILD_SCRIPT=Makefile \	63 APP_BUILD_SCRIPT=Makefile \

64 NDK_TOOLCHAIN_VERSION=clang3.4 \	64 NDK_TOOLCHAIN_VERSION=clang3.4 \

65 NDK_PROJECT_PATH=. \	65 NDK_PROJECT_PATH=. \

66 NDK_OUT=. \	66 NDK_OUT=. \

67 NDK_APP_DST_DIR=$(ANDROID_DEST_DIR)	67 NDK_APP_DST_DIR=$(ANDROID_DEST_DIR)

68 endif	68 endif

69	69

LEFT	RIGHT