diff options
| author | Colin Cross <ccross@android.com> | 2015-04-20 12:36:50 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2015-04-20 12:43:02 -0700 |
| commit | dc1e482b205ac6f04a4c1344bd0038e593a25ce3 (patch) | |
| tree | 120397e98dc6a3bb091a08219a6d2362c2313693 | |
| parent | b2b06de5fc9605919a06d7757c8ef4a7a48f3e87 (diff) | |
| download | system_core-dc1e482b205ac6f04a4c1344bd0038e593a25ce3.zip system_core-dc1e482b205ac6f04a4c1344bd0038e593a25ce3.tar.gz system_core-dc1e482b205ac6f04a4c1344bd0038e593a25ce3.tar.bz2 | |
Fix windows adb build
libc++ is not available on windows yet, but it already defaults to
static libstdc++.
Change-Id: I85a766ead84f71fe1f2f59be6ac739b0b833b6db
| -rw-r--r-- | adb/Android.mk | 5 | ||||
| -rw-r--r-- | fastboot/Android.mk | 5 |
2 files changed, 8 insertions, 2 deletions
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 @@ 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 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++ |