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

Commit 802f2116 authored by Colin Cross's avatar Colin Cross
Browse files

Translate BUILT_INSTALLED to LOCAL_BUILT_MODULE 

Soong creates install rules and lists them in LOCAL_SOONG_INSTALL_PAIRS,
where they get copied to ALL_MODULE.$(m).BUILT_INSTALLED.  BUILT_INSTALLED
is used by package-modules.mk to copy the built modules to alternate
install locations for building zips like continuous_native_tests.zip.

Translate Soong's built module location, which is listed in
LOCAL_PREBUILT_MODULE_FILE, into $(LOCAL_BUILT_MODULE) when setting
BUILT_INSTALLED so that package-modules.mk copies from
$(LOCAL_BUILT_MODULE) instead of $(LOCAL_PREBUILT_MODULE_FILE).  This
ensures that the transitive dependencies added to $(LOCAL_BUILT_MODULE),
for example the unstripped symbols files, are present when
continuous_native_tests.zip is built.

Bug: 206137439
Test: manual
Change-Id: I1a45cd6d3c81d6435a10f4d29557e521753068a4
parent 866d8243

core/base_rules.mk

+5 −1
Original line number Diff line number Diff line
@@ -932,9 +932,13 @@ ifneq (,$(LOCAL_SOONG_INSTALLED_MODULE)) 
  # 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))