diff options
| author | Colin Cross <ccross@android.com> | 2015-04-20 20:31:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-20 20:31:27 +0000 |
| commit | 10766eac61120732f11b82b1695207a3a5870a47 (patch) | |
| tree | 4336f7915b0d6e2363253b36b74b1c0cac0d69b3 /fastboot | |
| parent | 48131449d6258e369e5afeb6c665cc6a343ca297 (diff) | |
| parent | 6de70784ef5bdc6bf495fa86eda68deb16ef2f9e (diff) | |
| download | system_core-10766eac61120732f11b82b1695207a3a5870a47.zip system_core-10766eac61120732f11b82b1695207a3a5870a47.tar.gz system_core-10766eac61120732f11b82b1695207a3a5870a47.tar.bz2 | |
am 6de70784: am 631cf146: Merge "Fix windows adb build"
* commit '6de70784ef5bdc6bf495fa86eda68deb16ef2f9e':
Fix windows adb build
Diffstat (limited to 'fastboot')
| -rw-r--r-- | fastboot/Android.mk | 5 |
1 files changed, 4 insertions, 1 deletions
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_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++ |