commit e155ebe2d1790de6302477e3b5d0c0d4a1aa95f8
author Colin Cross <ccross@android.com> Mon Apr 20 18:56:32 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Apr 20 18:56:32 2015 +0000
tree 0aec5b735b94d12717bf4f2d7a206c9d13d6231a
parent b17768e17e7d0fd8743120028eda8fe90f873c97
parent 24bd8e0c84c3d87894090cfa3f1d0a0cfa63d19d

am 48131449: am 858cd9db: am b2b06de5: Merge "statically link adb and fastboot against libc++"

* commit '48131449d6258e369e5afeb6c665cc6a343ca297':
  statically link adb and fastboot against libc++

adb/Android.mk

diff --git a/adb/Android.mk b/adb/Android.mk
index f0117d3..3c48585 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -165,6 +165,13 @@
     libcutils \
     $(EXTRA_STATIC_LIBS) \
 
+LOCAL_CXX_STL := libc++_static
+
+# Don't add anything here, we don't want additional shared dependencies
+# on the host adb tool, and shared libraries that link against libc++
+# will violate ODR
+LOCAL_SHARED_LIBRARIES :=
+
 include $(BUILD_HOST_EXECUTABLE)
 
 $(call dist-for-goals,dist_files sdk,$(LOCAL_BUILT_MODULE))

fastboot/Android.mk

diff --git a/fastboot/Android.mk b/fastboot/Android.mk
index b9e957f..2ac3128 100644
--- a/fastboot/Android.mk
+++ b/fastboot/Android.mk
@@ -74,6 +74,13 @@
 LOCAL_STATIC_LIBRARIES += libf2fs_utils_host libf2fs_ioutils_host libf2fs_dlutils_host
 endif
 
+LOCAL_CXX_STL := libc++_static
+
+# Don't add anything here, we don't want additional shared dependencies
+# on the host fastboot tool, and shared libraries that link against libc++
+# will violate ODR
+LOCAL_SHARED_LIBRARIES :=
+
 include $(BUILD_HOST_EXECUTABLE)
 
 my_dist_files := $(LOCAL_BUILT_MODULE)