commit db2b78e2ca096b3fa8e3b033d524685c5be65cc5
author Andrew Hsieh <andrewhsieh@google.com> Tue Mar 18 02:46:48 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 18 02:46:49 2014 +0000
tree ecb1abd6c6aa7aacd36b880d22cc351dafd5335d
parent b70bc54f3e0caacd4fa11d8cd9b079ca0fe95c31
parent 3133a889e9e3e78ec2a80ed653c328d3f61fcf35

Merge "Fix build with new host toolchain"

Android.mk

diff --git a/Android.mk b/Android.mk
index fcc07f9..db75604 100644
--- a/Android.mk
+++ b/Android.mk
@@ -56,6 +56,9 @@
 
 include $(CLEAR_VARS)
 
+# not supported on 64-bit yet
+LOCAL_32_BIT_ONLY := true
+
 LOCAL_MODULE := libbcc
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES

libbcc.sha1.mk

diff --git a/libbcc.sha1.mk b/libbcc.sha1.mk
index 47a2be2..6759dd1 100644
--- a/libbcc.sha1.mk
+++ b/libbcc.sha1.mk
@@ -4,6 +4,9 @@
 
 include $(CLEAR_VARS)
 
+# not supported on 64-bit yet
+LOCAL_32_BIT_ONLY := true
+
 LOCAL_MODULE := libbcc.sha1
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES

tools/bcc/Android.mk

diff --git a/tools/bcc/Android.mk b/tools/bcc/Android.mk
index 4d6d462..8985377 100644
--- a/tools/bcc/Android.mk
+++ b/tools/bcc/Android.mk
@@ -44,6 +44,9 @@
 # ========================================================
 include $(CLEAR_VARS)
 
+# not supported on 64-bit yet
+LOCAL_32_BIT_ONLY := true
+
 LOCAL_MODULE := bcc
 LOCAL_MODULE_CLASS := EXECUTABLES