commit ada8f296570e0bda93b433a7aa86ad138dd1705e
author Ying Wang <wangying@google.com> Fri Jul 12 22:05:14 2013 -0700
committer Ying Wang <wangying@google.com> Fri Jul 12 22:05:14 2013 -0700
tree 08dec03bb7695a1b223faf6c0450b6440f4bf0a0
parent 265b8866ccfc7b2c251e2ea67dae03784b7ee831

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

core/prebuilt.mk

diff --git a/core/prebuilt.mk b/core/prebuilt.mk
index 6e08832..f5732d1 100644
--- a/core/prebuilt.mk
+++ b/core/prebuilt.mk
@@ -84,6 +84,14 @@
 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