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

Commit 143af928 authored by Colin Cross's avatar Colin Cross
Browse files

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
parent 6013329b

core/host_java_library.mk

+0 −5
Original line number Diff line number Diff line
@@ -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)

#######################################

core/soong_app_prebuilt.mk

+0 −5
Original line number Diff line number Diff line
@@ -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)

#######################################

core/soong_java_prebuilt.mk

+0 −5
Original line number Diff line number Diff line
@@ -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)

#######################################