diff options
| author | Colin Cross <ccross@android.com> | 2015-04-16 16:21:44 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2015-04-16 17:09:46 -0700 |
| commit | 55bf5f0017a76df0a97ec35f092054ef6f33c713 (patch) | |
| tree | 3b1125c0e84782e869302c9f3bc26a0e5691d8a2 | |
| parent | 04274a29ff534000ca38cdb627daab98cfa2878d (diff) | |
| download | system_core-55bf5f0017a76df0a97ec35f092054ef6f33c713.zip system_core-55bf5f0017a76df0a97ec35f092054ef6f33c713.tar.gz system_core-55bf5f0017a76df0a97ec35f092054ef6f33c713.tar.bz2 | |
statically link adb and fastboot against libc++
libc++.so is not widely available on the host, so we compile against
one built as part of the platform. This causes problems for adb and
fastboot, which are distributed through a number of channels - the
sdk, distro packages, downloaded from the build server, or manually
copied. Instead of forcing all users to handle libc++.so too,
statically link against libc++.
Change-Id: I51b75258653a23558c8b598802005f6c1166a439
| -rw-r--r-- | adb/Android.mk | 7 | ||||
| -rw-r--r-- | fastboot/Android.mk | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/adb/Android.mk b/adb/Android.mk index 3733ae3..5bba23e 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -161,6 +161,13 @@ ifeq ($(USE_SYSDEPS_WIN32),) LOCAL_STATIC_LIBRARIES += libcutils endif +LOCAL_CXX_STL := libc++_static + +# Don't add anything here, we don't want additional shared dependencies +# on the host adb tool, and shared libraries that link against libc++ +# will violate ODR +LOCAL_SHARED_LIBRARIES := + include $(BUILD_HOST_EXECUTABLE) $(call dist-for-goals,dist_files sdk,$(LOCAL_BUILT_MODULE)) 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) |