diff options
| -rw-r--r-- | adb/Android.mk | 7 | ||||
| -rw-r--r-- | fastboot/Android.mk | 7 |
2 files changed, 14 insertions, 0 deletions
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 @@ ifeq ($(USE_SYSDEPS_WIN32),) 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)) 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_REQUIRED_MODULES := libf2fs_fmt_host_dyn 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) |