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

Commit 66331624 authored by Ying Wang's avatar Ying Wang Committed by Gerrit Code Review
Browse files

Merge "Fix prebuilt library dependency for multilib build"

parents 9dba192b 58f462fc

core/executable_internal.mk

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ $(call target-executable-hook) 
skip_build_from_source :=

ifdef LOCAL_PREBUILT_MODULE_FILE

ifeq (,$(call if-build-from-source,$(LOCAL_MODULE),$(LOCAL_PATH)))

include $(BUILD_PREBUILT)

include $(BUILD_SYSTEM)/prebuilt_internal.mk

skip_build_from_source := true

endif

endif

core/host_executable.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ $(call host-executable-hook) 
skip_build_from_source :=

ifdef LOCAL_PREBUILT_MODULE_FILE

ifeq (,$(call if-build-from-source,$(LOCAL_MODULE),$(LOCAL_PATH)))

include $(BUILD_PREBUILT)

include $(BUILD_SYSTEM)/prebuilt_internal.mk

skip_build_from_source := true

endif

endif

core/host_shared_library.mk

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ $(call host-shared-library-hook) 
skip_build_from_source :=

ifdef LOCAL_PREBUILT_MODULE_FILE

ifeq (,$(call if-build-from-source,$(LOCAL_MODULE),$(LOCAL_PATH)))

include $(BUILD_PREBUILT)

include $(BUILD_SYSTEM)/prebuilt_internal.mk

skip_build_from_source := true

endif

endif

core/prebuilt_internal.mk

+3 −4
Original line number Diff line number Diff line
@@ -86,12 +86,13 @@ endif # prebuilt_module_is_a_library 
# of the shared libraries are determined.

ifdef LOCAL_INSTALLED_MODULE

ifdef LOCAL_SHARED_LIBRARIES

$(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES += $(LOCAL_MODULE):$(LOCAL_INSTALLED_MODULE):$(subst $(space),$(comma),$(LOCAL_SHARED_LIBRARIES))

$(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES += \

  $(LOCAL_MODULE):$(LOCAL_INSTALLED_MODULE):$(subst $(space),$(comma),$(LOCAL_SHARED_LIBRARIES))



# We also need the LOCAL_BUILT_MODULE dependency,

# since we use -rpath-link which points to the built module's path.

built_shared_libraries := \

    $(addprefix $($(my_prefix)OUT_INTERMEDIATE_LIBRARIES)/, \

    $(addprefix $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)OUT_INTERMEDIATE_LIBRARIES)/, \

    $(addsuffix $($(my_prefix)SHLIB_SUFFIX), \

        $(LOCAL_SHARED_LIBRARIES)))

$(LOCAL_BUILT_MODULE) : $(built_shared_libraries)
@@ -213,5 +214,3 @@ endif # TARGET JAVA_LIBRARIES 
$(built_module) : $(LOCAL_ADDITIONAL_DEPENDENCIES)



my_prebuilt_src_file :=
 


LOCAL_2ND_ARCH_VAR_PREFIX :=

core/shared_library_internal.mk

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ $(call target-shared-library-hook) 
skip_build_from_source :=

ifdef LOCAL_PREBUILT_MODULE_FILE

ifeq (,$(call if-build-from-source,$(LOCAL_MODULE),$(LOCAL_PATH)))

include $(BUILD_PREBUILT)

include $(BUILD_SYSTEM)/prebuilt_internal.mk

skip_build_from_source := true

endif

endif