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

Commit 58c4535b authored Sep 02, 2021 by Bob Badour

Re-call BUILD_NOTICE_FILE for modules that add deps

The normal pattern is:

1. Set a bunch of variables like LOCAL_MODULE
2. Include a makefile specific to the module type
3. The included file in turn includes base_rules.mk
4. At the end of base_rules.mk, it include notice_files.mk
5. The included file declares a build rule and finishes.

The below files included for some module types add additional
dependencies after returning from base_rules.mk, which are not
reflected in the notice files.

Including notice_files.mk a 2nd time adds these dependencies.

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Test: m systemlicense

Change-Id: I030399ffb13a2cfb58cf583ae5a2e418f5dbc534

parent 355f3459

core/host_java_library.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -131,3 +131,8 @@ $(eval $(call copy-one-file,$(LOCAL_FULL_CLASSES_JACOCO_JAR),$(full_classes_jar)
		ifeq ($(TURBINE_ENABLED),false)
		$(eval $(call copy-one-file,$(LOCAL_FULL_CLASSES_JACOCO_JAR),$(full_classes_header_jar)))
		endif

		#######################################
		# Capture deps added after base_rules.mk
		include $(BUILD_NOTICE_FILE)
		#######################################

core/soong_app_prebuilt.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -254,3 +254,8 @@ ifdef LOCAL_PREBUILT_COVERAGE_ARCHIVE
		endif

		SOONG_ALREADY_CONV += $(LOCAL_MODULE)

		#######################################
		# Capture deps added after base_rules.mk
		include $(BUILD_NOTICE_FILE)
		#######################################

core/soong_java_prebuilt.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -206,3 +206,8 @@ $(my_exported_sdk_libs_file):
		$(hide) touch $@)

		SOONG_ALREADY_CONV += $(LOCAL_MODULE)

		#######################################
		# Capture deps added after base_rules.mk
		include $(BUILD_NOTICE_FILE)
		#######################################