commit 31ec2c64b2c60bb82021607fc52a09f54d940e77
author Christopher Ferris <cferris@google.com> Fri Jun 13 16:27:34 2014 -0700
committer Christopher Ferris <cferris@google.com> Fri Jun 13 16:27:34 2014 -0700
tree a674a3c92c9b2c2649ec3a3a362c854115cd47b1
parent 5cd02e1e4908b0b8d08a64c247e97cc17ee8fedf

Fix host multilib support.

This was kludged a bit to get 64 bit host builds working. This
cleans everything up so it all works properly.

Change-Id: Ic86b1ca1ef563902f71cb77c8d55a5d5b28b47b7

Android.build.mk

diff --git a/Android.build.mk b/Android.build.mk
index 3254be6..1ae173d 100644
--- a/Android.build.mk
+++ b/Android.build.mk
@@ -18,8 +18,14 @@
 
 LOCAL_MODULE := $(module)
 LOCAL_MODULE_TAGS := $(module_tag)
+ifeq ($(build_type),host)
+# Always make host multilib
+LOCAL_MULTILIB := both
+else
 LOCAL_MULTILIB := $($(module)_multilib)
-ifeq ($(build_type),target)
+endif
+
+ifneq ($(findstring LIBRARY, $(build_target)),LIBRARY)
 ifeq ($(LOCAL_MULTILIB),both)
     LOCAL_MODULE_STEM_32 := $(module)32
     LOCAL_MODULE_STEM_64 := $(module)64