commit 574ab6f6763471338d9d4ca04ba3c8ff1394826b
author Ying Wang <wangying@google.com> Wed Jun 11 19:02:20 2014 -0700
committer Ying Wang <wangying@google.com> Wed Jun 11 19:02:20 2014 -0700
tree a874135ad8ffcbff604b1955de8e1c371af73c0b
parent f82fbdf2bf240e995c54696d89590308746d44c5

Declare the prebuilt executables as 32-bit.

Change-Id: Id4761a4cfb18c0d63feaea8d8ddee317cca6abff

tools/Android.mk

diff --git a/tools/Android.mk b/tools/Android.mk
index 6416bba..7e4a2ee 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)
 
@@ -188,6 +191,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)
 
@@ -202,6 +206,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)