commit c2074caf075818abb6d3689ad924ca09f4a5ba1f
author Tim Murray <timmurray@google.com> Tue Apr 08 15:39:08 2014 -0700
committer Tim Murray <timmurray@google.com> Wed Apr 23 10:43:24 2014 -0700
tree bf7ba60fa900f54498cb3087a3e780cd73be3ecf
parent 926e0fd2aa8ec58f8be38e2061aa07d9dde299a8

Update libbcc for 64-bit support.

Change-Id: I369a82eb6730a33c46b6700408952fe34020ca51

libbcc-device-build.mk

diff --git a/libbcc-device-build.mk b/libbcc-device-build.mk
index 06d7f86..61162de 100644
--- a/libbcc-device-build.mk
+++ b/libbcc-device-build.mk
@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+LOCAL_CLANG := true
+
 LOCAL_CFLAGS := \
   -Wall \
   -Wno-unused-parameter \
@@ -55,6 +57,7 @@
   LOCAL_CFLAGS_arm += -DARCH_ARM_HAVE_NEON
 endif
 
+LOCAL_CFLAGS_arm64 += -DFORCE_ARM64_CODEGEN
 LOCAL_CFLAGS_mips += -DFORCE_MIPS_CODEGEN
 
 LOCAL_CFLAGS_x86 += -DFORCE_X86_CODEGEN
@@ -66,7 +69,7 @@
 
 LOCAL_C_INCLUDES := \
   bionic \
-  external/stlport/stlport \
+  external/libcxx/include \
   $(LIBBCC_ROOT_PATH)/include \
   $(LLVM_ROOT_PATH)/include \
   $(LLVM_ROOT_PATH)/device/include \