am 858cd9db: am b2b06de5: Merge "statically link adb and fastboot against libc++"
* commit '858cd9db3f8712495c03282fb81c5e5d6924285b':
statically link adb and fastboot against libc++
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))
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)