diff options
| author | Colin Cross <ccross@android.com> | 2015-04-20 18:56:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-20 18:56:32 +0000 |
| commit | 454f35fd759b3db5f0e87309c15e7943e527534d (patch) | |
| tree | 0aec5b735b94d12717bf4f2d7a206c9d13d6231a /fastboot | |
| parent | cbe9d05020fab101afab2db8d44acc4bc5d5dc02 (diff) | |
| parent | 48131449d6258e369e5afeb6c665cc6a343ca297 (diff) | |
| download | system_core-454f35fd759b3db5f0e87309c15e7943e527534d.zip system_core-454f35fd759b3db5f0e87309c15e7943e527534d.tar.gz system_core-454f35fd759b3db5f0e87309c15e7943e527534d.tar.bz2 | |
am 48131449: am 858cd9db: am b2b06de5: Merge "statically link adb and fastboot against libc++"
* commit '48131449d6258e369e5afeb6c665cc6a343ca297':
statically link adb and fastboot against libc++
Diffstat (limited to 'fastboot')
| -rw-r--r-- | fastboot/Android.mk | 7 |
1 files changed, 7 insertions, 0 deletions
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) |