commit e7d69bbe49f69b4a334571d96d0ef0f8021f37af
author Ying Wang <wangying@google.com> Thu Jun 12 02:37:26 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 10 22:15:14 2014 +0000
tree ea3881941b27a5eceaa8cb2dfe8de8838b3a5f37
parent cf5237b5a263eb3b9dc3f883fbcc69eb601d1f15
parent edf2ff175235a97f097b75edd9437fa6c5824366

Merge "Declare the prebuilt executables as 32-bit."

tools/Android.mk

diff --git a/tools/Android.mk b/tools/Android.mk
index c170eb2..f52c2b7 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -44,6 +44,7 @@
 LOCAL_MODULE_SUFFIX := $(HOST_EXECUTABLE_SUFFIX)
 LOCAL_BUILT_MODULE_STEM := aidl$(HOST_EXECUTABLE_SUFFIX)
 LOCAL_IS_HOST_MODULE := true
+LOCAL_MULTILIB := 32
 
 include $(BUILD_PREBUILT)
 
@@ -57,6 +58,7 @@
 LOCAL_MODULE_SUFFIX := $(HOST_EXECUTABLE_SUFFIX)
 LOCAL_BUILT_MODULE_STEM := aapt$(HOST_EXECUTABLE_SUFFIX)
 LOCAL_IS_HOST_MODULE := true
+LOCAL_MULTILIB := 32
 
 include $(BUILD_PREBUILT)
 
@@ -71,6 +73,7 @@
 LOCAL_MODULE_SUFFIX := $(HOST_EXECUTABLE_SUFFIX)
 LOCAL_BUILT_MODULE_STEM := zipalign$(HOST_EXECUTABLE_SUFFIX)
 LOCAL_IS_HOST_MODULE := true
+LOCAL_MULTILIB := 32
 
 include $(BUILD_PREBUILT)
 
@@ -139,6 +142,7 @@
 LOCAL_MODULE_SUFFIX := $(HOST_EXECUTABLE_SUFFIX)
 LOCAL_BUILT_MODULE_STEM := llvm-rs-cc$(HOST_EXECUTABLE_SUFFIX)
 LOCAL_IS_HOST_MODULE := true
+LOCAL_MULTILIB := 32
 
 include $(BUILD_PREBUILT)
 
@@ -153,6 +157,7 @@
 LOCAL_MODULE_SUFFIX := $(HOST_EXECUTABLE_SUFFIX)
 LOCAL_BUILT_MODULE_STEM := $(LOCAL_MODULE)$(HOST_EXECUTABLE_SUFFIX)
 LOCAL_IS_HOST_MODULE := true
+LOCAL_MULTILIB := 32
 
 include $(BUILD_PREBUILT)