Loading core/cc_prebuilt_internal.mk +7 −5 Original line number Original line Diff line number Diff line Loading @@ -135,21 +135,23 @@ else endif endif endif endif my_shared_libraries := \ my_shared_libraries := $(strip \ $(filter-out $(my_system_shared_libraries),$(LOCAL_SHARED_LIBRARIES)) \ $(filter-out $(my_system_shared_libraries),$(LOCAL_SHARED_LIBRARIES)) \ $(my_system_shared_libraries) $(my_system_shared_libraries)) ifdef my_shared_libraries # Extra shared libraries introduced by LOCAL_CXX_STL (may append some libraries to # Extra shared libraries introduced by LOCAL_CXX_STL. # my_shared_libraries). include $(BUILD_SYSTEM)/cxx_stl_setup.mk include $(BUILD_SYSTEM)/cxx_stl_setup.mk ifdef my_shared_libraries ifdef LOCAL_USE_VNDK ifdef LOCAL_USE_VNDK my_shared_libraries := $(foreach l,$(my_shared_libraries),\ my_shared_libraries := $(foreach l,$(my_shared_libraries),\ $(if $(SPLIT_VENDOR.SHARED_LIBRARIES.$(l)),$(l).vendor,$(l))) $(if $(SPLIT_VENDOR.SHARED_LIBRARIES.$(l)),$(l).vendor,$(l))) endif endif $(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES += \ $(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES += \ $(my_register_name):$(LOCAL_INSTALLED_MODULE):$(subst $(space),$(comma),$(my_shared_libraries)) $(my_register_name):$(LOCAL_INSTALLED_MODULE):$(subst $(space),$(comma),$(my_shared_libraries)) endif endif # my_shared_libraries endif # my_shared_libraries endif # LOCAL_INSTALLED_MODULE # We need to enclose the above export_includes and my_built_shared_libraries in # We need to enclose the above export_includes and my_built_shared_libraries in # "my_strip_module not true" because otherwise the rules are defined in dynamic_binary.mk. # "my_strip_module not true" because otherwise the rules are defined in dynamic_binary.mk. Loading Loading
core/cc_prebuilt_internal.mk +7 −5 Original line number Original line Diff line number Diff line Loading @@ -135,21 +135,23 @@ else endif endif endif endif my_shared_libraries := \ my_shared_libraries := $(strip \ $(filter-out $(my_system_shared_libraries),$(LOCAL_SHARED_LIBRARIES)) \ $(filter-out $(my_system_shared_libraries),$(LOCAL_SHARED_LIBRARIES)) \ $(my_system_shared_libraries) $(my_system_shared_libraries)) ifdef my_shared_libraries # Extra shared libraries introduced by LOCAL_CXX_STL (may append some libraries to # Extra shared libraries introduced by LOCAL_CXX_STL. # my_shared_libraries). include $(BUILD_SYSTEM)/cxx_stl_setup.mk include $(BUILD_SYSTEM)/cxx_stl_setup.mk ifdef my_shared_libraries ifdef LOCAL_USE_VNDK ifdef LOCAL_USE_VNDK my_shared_libraries := $(foreach l,$(my_shared_libraries),\ my_shared_libraries := $(foreach l,$(my_shared_libraries),\ $(if $(SPLIT_VENDOR.SHARED_LIBRARIES.$(l)),$(l).vendor,$(l))) $(if $(SPLIT_VENDOR.SHARED_LIBRARIES.$(l)),$(l).vendor,$(l))) endif endif $(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES += \ $(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES += \ $(my_register_name):$(LOCAL_INSTALLED_MODULE):$(subst $(space),$(comma),$(my_shared_libraries)) $(my_register_name):$(LOCAL_INSTALLED_MODULE):$(subst $(space),$(comma),$(my_shared_libraries)) endif endif # my_shared_libraries endif # my_shared_libraries endif # LOCAL_INSTALLED_MODULE # We need to enclose the above export_includes and my_built_shared_libraries in # We need to enclose the above export_includes and my_built_shared_libraries in # "my_strip_module not true" because otherwise the rules are defined in dynamic_binary.mk. # "my_strip_module not true" because otherwise the rules are defined in dynamic_binary.mk. Loading