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

Commit 82962a98 authored by Jiyong Park's avatar Jiyong Park
Browse files

cxx_stl_setup is not executed for modules from soong 

cxx_stl_setup is adding libunwind_llvm to the dependency even for
modules from soong. However, since this dependency was already handled
in soong, those modules don't need to go through it again.

Bug: 64815735
Test: BOARD_VNDK_VERSION=current mma -j (under /hardware/libhardware)

Merged-Id: Id6e2547c752ec831aa56a14c0bf4db0a55d51243
Change-Id: Id6e2547c752ec831aa56a14c0bf4db0a55d51243
(cherry picked from commit 425d489c)
parent f01a5ef7

core/binary.mk

+4 −0
Original line number Original line Diff line number Diff line
@@ -53,6 +53,7 @@ my_asflags := $(LOCAL_ASFLAGS) 
my_cc := $(LOCAL_CC)

my_cc := $(LOCAL_CC)

my_cc_wrapper := $(CC_WRAPPER)

my_cc_wrapper := $(CC_WRAPPER)

my_cxx := $(LOCAL_CXX)

my_cxx := $(LOCAL_CXX)

my_cxx_ldlibs :=

my_cxx_wrapper := $(CXX_WRAPPER)

my_cxx_wrapper := $(CXX_WRAPPER)

my_c_includes := $(LOCAL_C_INCLUDES)

my_c_includes := $(LOCAL_C_INCLUDES)

my_generated_sources := $(LOCAL_GENERATED_SOURCES)

my_generated_sources := $(LOCAL_GENERATED_SOURCES)
@@ -447,7 +448,10 @@ my_static_libraries := $(LOCAL_STATIC_LIBRARIES_$($(my_prefix)$(LOCAL_2ND_ARCH_V 
my_whole_static_libraries := $(LOCAL_WHOLE_STATIC_LIBRARIES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_WHOLE_STATIC_LIBRARIES_$(my_32_64_bit_suffix)) $(my_whole_static_libraries)

my_whole_static_libraries := $(LOCAL_WHOLE_STATIC_LIBRARIES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_WHOLE_STATIC_LIBRARIES_$(my_32_64_bit_suffix)) $(my_whole_static_libraries)

my_header_libraries := $(LOCAL_HEADER_LIBRARIES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_HEADER_LIBRARIES_$(my_32_64_bit_suffix)) $(my_header_libraries)

my_header_libraries := $(LOCAL_HEADER_LIBRARIES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_HEADER_LIBRARIES_$(my_32_64_bit_suffix)) $(my_header_libraries)





# soong defined modules already have done through this

ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))

include $(BUILD_SYSTEM)/cxx_stl_setup.mk

include $(BUILD_SYSTEM)/cxx_stl_setup.mk

endif





# Add static HAL libraries

# Add static HAL libraries

ifdef LOCAL_HAL_STATIC_LIBRARIES

ifdef LOCAL_HAL_STATIC_LIBRARIES