From: Colin Cross <ccross@android.com>
Date: Thu, 23 Jan 2014 01:36:05 +0000 (-0800)
Subject: build: use correct arm vs thumb arguments for 2nd arch builds
X-Git-Tag: android-x86-6.0-r1~445^2~650^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6e087a339b61804aee00dbdf85106653c861e32f;p=android-x86%2Fbuild.git

build: use correct arm vs thumb arguments for 2nd arch builds

Set arm_objects_mode and normal_objects_mode when building a
module for arm when it is the 2nd arch.

Change-Id: I5f7df519b6e1dde6cbf92d106681f07a58e1f1f2
---

diff --git a/core/binary.mk b/core/binary.mk
index a3a9c16d2..3582ba06a 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -281,7 +281,7 @@ endif
 ## Define arm-vs-thumb-mode flags.
 ###########################################################
 LOCAL_ARM_MODE := $(strip $(LOCAL_ARM_MODE))
-ifeq ($(TARGET_ARCH),arm)
+ifeq ($(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH),arm)
 arm_objects_mode := $(if $(LOCAL_ARM_MODE),$(LOCAL_ARM_MODE),arm)
 normal_objects_mode := $(if $(LOCAL_ARM_MODE),$(LOCAL_ARM_MODE),thumb)