commit af7a29756b048becfe52d44032f1b7b033407d3d
author Ian Rogers <irogers@google.com> Thu Jun 05 10:35:29 2014 -0700
committer Ian Rogers <irogers@google.com> Thu Jun 05 11:07:57 2014 -0700
tree b803794a25b5e67a43f580dd39f9edbecb0750bb
parent b8c41be3236bd92c11b505ab78f4be194539125b

Build libunwind with host multilib support.

Change-Id: Ic30de0c7dda367b6d0067c0cfe1a74ae27eeecb5

Android.build.mk

diff --git a/Android.build.mk b/Android.build.mk
index 18a324f..3254be6 100644
--- a/Android.build.mk
+++ b/Android.build.mk
@@ -19,10 +19,12 @@
 LOCAL_MODULE := $(module)
 LOCAL_MODULE_TAGS := $(module_tag)
 LOCAL_MULTILIB := $($(module)_multilib)
+ifeq ($(build_type),target)
 ifeq ($(LOCAL_MULTILIB),both)
     LOCAL_MODULE_STEM_32 := $(module)32
     LOCAL_MODULE_STEM_64 := $(module)64
 endif
+endif
 
 LOCAL_ADDITIONAL_DEPENDENCIES := \
     $(LOCAL_PATH)/Android.mk \