commit b0d6d1f7aff775dd8503f8d24c856ccd94a3ae0a
author Tim Murray <timmurray@google.com> Tue Apr 08 19:39:20 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 08 19:39:21 2014 +0000
tree e5986f5097a5604fd994f1030046aa7947d9fa75
parent 7c5ed3adad4e2be769c5740187985da510f2cfe3
parent b845185145254faeb1e24e33f39bafd8d51d1a38

Merge "Revert "Enable 64bit build for x64 target""

Android.mk

diff --git a/Android.mk b/Android.mk
index f27d65b..db75604 100644
--- a/Android.mk
+++ b/Android.mk
@@ -56,10 +56,8 @@
 
 include $(CLEAR_VARS)
 
-ifneq ($(TARGET_ARCH), x86_64)
 # not supported on 64-bit yet
 LOCAL_32_BIT_ONLY := true
-endif
 
 LOCAL_MODULE := libbcc
 LOCAL_MODULE_TAGS := optional

libbcc.sha1.mk

diff --git a/libbcc.sha1.mk b/libbcc.sha1.mk
index 3581d9a..6759dd1 100644
--- a/libbcc.sha1.mk
+++ b/libbcc.sha1.mk
@@ -4,10 +4,8 @@
 
 include $(CLEAR_VARS)
 
-ifneq ($(TARGET_ARCH), x86_64)
 # not supported on 64-bit yet
 LOCAL_32_BIT_ONLY := true
-endif
 
 LOCAL_MODULE := libbcc.sha1
 LOCAL_MODULE_TAGS := optional