From 143af9284f970fb246120f12ca2a60255ea76fcb Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 29 Nov 2021 21:50:45 -0800 Subject: [PATCH] Remove duplicate includes of BUILD_NOTICE_FILE Some module types include BUILD_NOTICE_FILE a second time after the include from base_rules.mk. This won't work after a future change, and doesn't seem to be necessary as none of the files leave any modified LOCAL* variables in place for notice_files.mk to read. Bug: 207445310 Test: m checkbuild Change-Id: I8c68888d6bf26926f5c2216abe147ccf28ddc2b8 --- core/host_java_library.mk | 5 ----- core/soong_app_prebuilt.mk | 5 ----- core/soong_java_prebuilt.mk | 5 ----- 3 files changed, 15 deletions(-) diff --git a/core/host_java_library.mk b/core/host_java_library.mk index 07797c8c12..0f9520297a 100644 --- a/core/host_java_library.mk +++ b/core/host_java_library.mk @@ -131,8 +131,3 @@ $(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) -####################################### diff --git a/core/soong_app_prebuilt.mk b/core/soong_app_prebuilt.mk index dcb5a2efc8..006e1dca24 100644 --- a/core/soong_app_prebuilt.mk +++ b/core/soong_app_prebuilt.mk @@ -258,8 +258,3 @@ ifdef LOCAL_PREBUILT_COVERAGE_ARCHIVE endif SOONG_ALREADY_CONV += $(LOCAL_MODULE) - -####################################### -# Capture deps added after base_rules.mk -include $(BUILD_NOTICE_FILE) -####################################### diff --git a/core/soong_java_prebuilt.mk b/core/soong_java_prebuilt.mk index 801a2655d4..b819cdc85c 100644 --- a/core/soong_java_prebuilt.mk +++ b/core/soong_java_prebuilt.mk @@ -209,8 +209,3 @@ $(my_exported_sdk_libs_file): $(hide) touch $@) SOONG_ALREADY_CONV += $(LOCAL_MODULE) - -####################################### -# Capture deps added after base_rules.mk -include $(BUILD_NOTICE_FILE) -#######################################