From 2958af2aeb3430806b223af65352a4afaf89c514 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 22 Jan 2014 17:36:05 -0800
Subject: [PATCH] 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
---
 core/binary.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/binary.mk b/core/binary.mk
index 7912fb457..3ecb26b84 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -280,7 +280,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)
 
-- 
2.11.0