commit d227fac95b7a8bbaf7a6f02ac8096820e5b871c5
author Bob Badour <bbadour@google.com> Tue Jun 14 18:18:45 2022 +0000
committer Bob Badour <bbadour@google.com> Tue Jun 14 11:33:54 2022 -0700
tree c1c4f0837afdf01de9774a99dd14e94220210697
parent 6ebfaa453b576a0a803500d93638bff0c707b6ec

Revert "Revert "Revert "Revert "Create lists of projects to share per dist target""""

This reverts commit 398bd879502c88856cae6daca5b9160bd0bdfae0.

Reason for revert: Rolling forward again without 'all' target.

Bug: 151177513
Bug: 210912771
Bug: 235333302
Bug: 232138105

Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_coral_hwasan TARGET_BUILD_VARIANT=userdebug droid dist with-license platform_tests continuous_instrumentation_tests continuous_native_tests

Test: tapas google-tradefed-all && m dist

Change-Id: I1e5f5639ebf1fa61060124a5183f6f0a2ece04b5

core/notice_files.mk

diff --git a/core/notice_files.mk b/core/notice_files.mk
index 84523af..cbfcaa4 100644
--- a/core/notice_files.mk
+++ b/core/notice_files.mk
@@ -125,7 +125,7 @@
 module_license_metadata :=
 
 ifdef my_register_name
-  module_license_metadata := $(call local-intermediates-dir)/$(my_register_name).meta_lic
+  module_license_metadata := $(call local-meta-intermediates-dir)/$(my_register_name).meta_lic
 
   $(foreach target,$(ALL_MODULES.$(my_register_name).BUILT) $(ALL_MODULES.$(my_register_name).INSTALLED) $(foreach bi,$(LOCAL_SOONG_BUILT_INSTALLED),$(call word-colon,1,$(bi))) \
       $(my_test_data) $(my_test_config),\