diff --git a/adb/Android.mk b/adb/Android.mk
index 3733ae3..5bba23e 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -161,6 +161,13 @@
     LOCAL_STATIC_LIBRARIES += libcutils
 endif
 
+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))