commit 47a65bc4e3fdea709e220c3b822166be70fdd205
author Stephen Hines <srhines@google.com> Fri Apr 25 22:51:40 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 25 22:51:40 2014 +0000
tree 07d4d725c47a05608e42f9e52b673ea5b6854c85
parent bd5f5a87abc910fcc8aaeb72ad388ee9e5fcccfc
parent 01d4881f5cba62d6cd5f27010fddfd9df27b0a08

am 01d4881f: Merge "Build with libc++ instead of stlport."

* commit '01d4881f5cba62d6cd5f27010fddfd9df27b0a08':
  Build with libc++ instead of stlport.

mcld-device-build.mk

diff --git a/mcld-device-build.mk b/mcld-device-build.mk
index 42d6d56..4c73156 100644
--- a/mcld-device-build.mk
+++ b/mcld-device-build.mk
@@ -30,7 +30,8 @@
 # Make sure bionic is first so we can include system headers.
 LOCAL_C_INCLUDES := \
   bionic \
-  external/stlport/stlport \
+  external/libcxx/include \
+  external/libcxxabi/include \
   $(MCLD_ROOT_PATH)/include \
   $(LLVM_ROOT_PATH) \
   $(LLVM_ROOT_PATH)/include \

mcld-host-build.mk

diff --git a/mcld-host-build.mk b/mcld-host-build.mk
index 9bfc958..e427b31 100644
--- a/mcld-host-build.mk
+++ b/mcld-host-build.mk
@@ -1,5 +1,7 @@
 include $(LLVM_HOST_BUILD_MK)
 
+include external/libcxx/libcxx.mk
+
 LOCAL_CFLAGS := \
   -include $(MCLD_ROOT_PATH)/include/mcld/Config/Config.h \
   $(LOCAL_CFLAGS)
@@ -27,6 +29,7 @@
   $(LLVM_ROOT_PATH) \
   $(LLVM_ROOT_PATH)/include \
   $(LLVM_ROOT_PATH)/host/include \
+  external/libcxx/include \
   $(LOCAL_C_INCLUDES)
 
 LOCAL_IS_HOST_MODULE := true