Establish the built module dependencies on prebuilt shared library
This is needed because the linker command line uses -rpath-link with
built module path ($(*_OUT_INTERMEDIATE_LIBRARIES)) to search for indirect
dependency libraries.
Change-Id: I21d537c7c697dfb18df25d3d2bb7bffe2f9d370f
(cherry picked from commit ada8f29657
)
This commit is contained in:
parent
a3d60ae86f
commit
ba9636d47f
1 changed files with 8 additions and 0 deletions
|
@ -84,6 +84,14 @@ endif # prebuilt_module_is_a_library
|
|||
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))
|
||||
|
||||
# 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)/, \
|
||||
$(addsuffix $(so_suffix), \
|
||||
$(LOCAL_SHARED_LIBRARIES)))
|
||||
$(LOCAL_BUILT_MODULE) : $(built_shared_libraries)
|
||||
endif
|
||||
endif
|
||||
|
||||
|
|
Loading…
Reference in a new issue