Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55bf5f00 authored by Colin Cross's avatar Colin Cross
Browse files

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
parent 04274a29

adb/Android.mk

+7 −0
Original line number Diff line number Diff line
@@ -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))

fastboot/Android.mk

+7 −0
Original line number Diff line number Diff line
@@ -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)