commit b6b00c6e44e1630ac263092483a07ac3bd026f75
author Colin Cross <ccross@android.com> Mon Apr 20 20:18:56 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Apr 20 20:18:56 2015 +0000
tree 120397e98dc6a3bb091a08219a6d2362c2313693
parent 0d8c7baafb802f3f9ed9e54976596043925784ba
parent 679596a47615e4bacaadab0158c3b1d4f44b6821

am 631cf146: Merge "Fix windows adb build"

* commit '631cf146274e4f0ef425fd491d39c969a20628a1':
  Fix windows adb build

adb/Android.mk

diff --git a/adb/Android.mk b/adb/Android.mk
index 3c48585..d120f0a 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -165,7 +165,10 @@
     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++

fastboot/Android.mk

diff --git a/fastboot/Android.mk b/fastboot/Android.mk
index 2ac3128..7b2975b 100644
--- a/fastboot/Android.mk
+++ b/fastboot/Android.mk
@@ -74,7 +74,10 @@
 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++