commit d1c2c4e1b8b44699f3d166a308c8cf05c0d2cfea
author Colin Cross <ccross@android.com> Mon Nov 15 23:57:57 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 15 23:57:57 2021 +0000
tree 830135d47ef13befa540983042492be6df210446
parent f1e1bcb0ee7c39ea763dfc79751273d1d90f719e
parent 802f2116ed43ed36721b2d623d114ffa1b1268ed

Merge "Translate BUILT_INSTALLED to LOCAL_BUILT_MODULE"

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 02b424d..134cb8f 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -932,9 +932,13 @@
   # of files provided by this module.  Used by custom packaging rules like
   # package-modules.mk that need to copy the built files to a custom install
   # location during packaging.
+  #
+  # Translate copies from $(LOCAL_PREBUILT_MODULE_FILE) to $(LOCAL_BUILT_MODULE)
+  # so that package-modules.mk gets any transtive dependencies added to
+  # $(LOCAL_BUILT_MODULE), for example unstripped symbols files.
   ALL_MODULES.$(my_register_name).BUILT_INSTALLED := \
     $(strip $(ALL_MODULES.$(my_register_name).BUILT_INSTALLED) \
-      $(LOCAL_SOONG_INSTALL_PAIRS) \
+      $(patsubst $(LOCAL_PREBUILT_MODULE_FILE):%,$(LOCAL_BUILT_MODULE):%,$(LOCAL_SOONG_INSTALL_PAIRS)) \
       $(my_init_rc_pairs) \
       $(my_test_data_pairs) \
       $(my_vintf_pairs))