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

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

Merge "Fix windows adb build"

parents b2b06de5 dc1e482b

adb/Android.mk

+4 −1
Original line number Diff line number Diff line
@@ -165,7 +165,10 @@ LOCAL_STATIC_LIBRARIES := \ 
    libcutils \

    $(EXTRA_STATIC_LIBS) \



# 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++

fastboot/Android.mk

+4 −1
Original line number Diff line number Diff line
@@ -74,7 +74,10 @@ LOCAL_REQUIRED_MODULES := libf2fs_fmt_host_dyn 
LOCAL_STATIC_LIBRARIES += libf2fs_utils_host libf2fs_ioutils_host libf2fs_dlutils_host

endif



# 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++