From dc1e482b205ac6f04a4c1344bd0038e593a25ce3 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 20 Apr 2015 12:36:50 -0700 Subject: [PATCH] Fix windows adb build libc++ is not available on windows yet, but it already defaults to static libstdc++. Change-Id: I85a766ead84f71fe1f2f59be6ac739b0b833b6db --- adb/Android.mk | 5 ++++- fastboot/Android.mk | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/adb/Android.mk b/adb/Android.mk index 3c48585d0..d120f0acf 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -165,7 +165,10 @@ LOCAL_STATIC_LIBRARIES := \ libcutils \ $(EXTRA_STATIC_LIBS) \ -LOCAL_CXX_STL := libc++_static +# libc++ not available on windows yet +ifneq ($(HOST_OS),windows) + LOCAL_CXX_STL := libc++_static +endif # Don't add anything here, we don't want additional shared dependencies # on the host adb tool, and shared libraries that link against libc++ diff --git a/fastboot/Android.mk b/fastboot/Android.mk index 2ac312876..7b2975b7f 100644 --- a/fastboot/Android.mk +++ b/fastboot/Android.mk @@ -74,7 +74,10 @@ 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 +# libc++ not available on windows yet +ifneq ($(HOST_OS),windows) + LOCAL_CXX_STL := libc++_static +endif # Don't add anything here, we don't want additional shared dependencies # on the host fastboot tool, and shared libraries that link against libc++