commit 83257fb3041677013d1b988475a2740f5be34ee9
author Colin Cross <ccross@android.com> Thu Jan 23 02:04:38 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 23 02:04:38 2014 +0000
tree 427ee7827250ba0160a99019aef1b22693125f79
parent bf4324ef5cc7be7e1bd50624735249c3c3c2d58b
parent 2958af2aeb3430806b223af65352a4afaf89c514

Merge changes I5f7df519,I0e8b02f0

* changes:
  build: use correct arm vs thumb arguments for 2nd arch builds
  build: print module that has unhandled install path

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 64ca5b2..72cc2ce 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -118,7 +118,7 @@
 
   LOCAL_MODULE_PATH := $($(install_path_var))
   ifeq ($(strip $(LOCAL_MODULE_PATH)),)
-    $(error $(LOCAL_PATH): unhandled install path "$(install_path_var)")
+    $(error $(LOCAL_PATH): unhandled install path "$(install_path_var) for $(LOCAL_MODULE)")
   endif
 endif
 endif # not LOCAL_UNINSTALLABLE_MODULE

core/binary.mk

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