merge from open-source master

Change-Id: I0221f3903a2fc6a0fb25ae62913fdc2e9d3c3f4f

core/combo/TARGET_linux-x86.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -159,7 +159,7 @@ $(TARGET_CXX) \
		$(TARGET_CRTEND_O)
		endef

		TARGET_GLOBAL_CFLAGS += -m32
		TARGET_GLOBAL_CFLAGS += -m32 -D__ANDROID__
		TARGET_GLOBAL_LDFLAGS += -m32

		endif #simulator