commit f82fbdf2bf240e995c54696d89590308746d44c5
author Ying Wang <wangying@google.com> Mon Jun 09 18:22:09 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 09 18:22:09 2014 +0000
tree ecc07cceb245d342c452a5404d4926a83a3a9dc4
parent 08eb00108f07923a7c66d0d2d9c4cc2cd3d17517
parent 8a6e96769b739ae67c30e1c63e77479a4f7d88bc

am 8a6e9676: am cf5237b5: Merge "Mark prebuilt libs as 32-bit."

* commit '8a6e96769b739ae67c30e1c63e77479a4f7d88bc':
  Mark prebuilt libs as 32-bit.

tools/Android.mk

diff --git a/tools/Android.mk b/tools/Android.mk
index e32369b..6416bba 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -214,6 +214,7 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_SUFFIX := $(HOST_SHLIB_SUFFIX)
 LOCAL_IS_HOST_MODULE := true
+LOCAL_MULTILIB := 32
 
 include $(BUILD_PREBUILT)
 
@@ -226,6 +227,7 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_SUFFIX := $(HOST_SHLIB_SUFFIX)
 LOCAL_IS_HOST_MODULE := true
+LOCAL_MULTILIB := 32
 
 include $(BUILD_PREBUILT)
 
@@ -238,6 +240,7 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_SUFFIX := $(HOST_SHLIB_SUFFIX)
 LOCAL_IS_HOST_MODULE := true
+LOCAL_MULTILIB := 32
 
 include $(BUILD_PREBUILT)
 
@@ -257,6 +260,7 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_SUFFIX := $(HOST_SHLIB_SUFFIX)
 LOCAL_IS_HOST_MODULE := true
+LOCAL_MULTILIB := 32
 
 include $(BUILD_PREBUILT)
 
@@ -269,6 +273,7 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_SUFFIX := $(HOST_SHLIB_SUFFIX)
 LOCAL_IS_HOST_MODULE := true
+LOCAL_MULTILIB := 32
 
 include $(BUILD_PREBUILT)