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

Commit b2b06de5 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "statically link adb and fastboot against libc++"

parents 63fba52c 55bf5f00

adb/Android.mk

+7 −0
Original line number Diff line number Diff line
@@ -165,6 +165,13 @@ LOCAL_STATIC_LIBRARIES := \ 
    libcutils \

    $(EXTRA_STATIC_LIBS) \



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)