Merge "Set arm specific variables to be empty for non-arm platforms" (daea3fce) · Commits · e / os / android_build

core/binary.mk

+7 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ endif
		## Define arm-vs-thumb-mode flags.
		###########################################################
		LOCAL_ARM_MODE := $(strip $(LOCAL_ARM_MODE))
		ifeq ($(TARGET_ARCH),arm)
		arm_objects_mode := $(if $(LOCAL_ARM_MODE),$(LOCAL_ARM_MODE),arm)
		normal_objects_mode := $(if $(LOCAL_ARM_MODE),$(LOCAL_ARM_MODE),thumb)

		@@ -61,6 +62,12 @@ normal_objects_mode := $(if $(LOCAL_ARM_MODE),$(LOCAL_ARM_MODE),thumb)
		# actually used (although they are usually empty).
		arm_objects_cflags := $($(my_prefix)$(arm_objects_mode)_CFLAGS)
		normal_objects_cflags := $($(my_prefix)$(normal_objects_mode)_CFLAGS)
		else
		arm_objects_mode :=
		normal_objects_mode :=
		arm_objects_cflags :=
		normal_objects_cflags :=
		endif

		###########################################################
		## Define per-module debugging flags. Users can turn on