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

Commit 81421fe7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert "Fix missing notices.""" am: e2325f0e 

Original change: https://android-review.googlesource.com/c/platform/build/+/2172708



Change-Id: I85f7975e53db2fa982d0baae50fb26bc6ac3d543
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8ddadca9 e2325f0e

core/Makefile

+62 −0
Original line number Diff line number Diff line
@@ -1686,6 +1686,63 @@ endif # PRODUCT_NOTICE_SPLIT 


ALL_DEFAULT_INSTALLED_MODULES += $(installed_notice_html_or_xml_gz)



need_vendor_notice:=false

ifeq ($(BUILDING_VENDOR_BOOT_IMAGE),true)

   need_vendor_notice:=true

endif



ifdef BUILDING_DEBUG_VENDOR_BOOT_IMAGE

   need_vendor_notice:=true

endif



ifdef BUILDING_VENDOR_IMAGE

   need_vendor_notice:=true

endif



ifeq (true,$(need_vendor_notice))

ifneq (,$(installed_vendor_notice_xml_gz))

ALL_DEFAULT_INSTALLED_MODULES += $(installed_vendor_notice_xml_gz)

endif

endif



need_vendor_notice:=



ifdef BUILDING_ODM_IMAGE

ifneq (,$(installed_odm_notice_xml_gz))

ALL_DEFAULT_INSTALLED_MODULES += $(installed_odm_notice_xml_gz)

endif

endif



ifdef BUILDING_PRODUCT_IMAGE

ifneq (,$(installed_product_notice_xml_gz))

ALL_DEFAULT_INSTALLED_MODULES += $(installed_product_notice_xml_gz)

endif

endif



ifdef BUILDING_SYSTEM_EXT_IMAGE

ifneq (,$(installed_system_ext_notice_xml_gz))

ALL_DEFAULT_INSTALLED_MODULES += $(installed_system_ext_notice_xml_gz)

endif

endif



ifdef BUILDING_VENDOR_DLKM_IMAGE

ifneq (,$(installed_vendor_dlkm_notice_xml_gz)

ALL_DEFAULT_INSTALLED_MODULES += $(installed_vendor_dlkm_notice_xml_gz)

endif

endif



ifdef BUILDING_ODM_DLKM_IMAGE

ifneq (,$(installed_odm_dlkm_notice_xml_gz))

ALL_DEFAULT_INSTALLED_MODULES += $(installed_odm_dlkm_notice_xml_gz)

endif

endif



ifdef BUILDING_SYSTEM_DLKM_IMAGE

ifneq (,$(installed_system_dlkm_notice_xml_gz))

ALL_DEFAULT_INSTALLED_MODULES += $(installed_system_dlkm_notice_xml_gz)

endif

endif



endif  # TARGET_BUILD_APPS



# The kernel isn't really a module, so to get its module file in there, we
@@ -3865,6 +3922,11 @@ $(INSTALLED_SYSTEM_DLKMIMAGE_TARGET): \ 
    $(INSTALLED_FILES_FILE_SYSTEM_DLKM)

	$(build-system_dlkmimage-target)



SYSTEM_DLKM_NOTICE_DEPS += $(INSTALLED_SYSTEM_DLKMIMAGE_TARGET)



$(call declare-1p-container,$(INSTALLED_SYSTEM_DLKMIMAGE_TARGET),)

$(call declare-container-license-deps,$(INSTALLED_SYSTEM_DLKMIMAGE_TARGET),$(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_SYSTEM_DLKMIMAGE_FILES) $(INSTALLED_FILES_FILE_SYSTEM_DLKM),$(PRODUCT_OUT)/:/)



.PHONY: system_dlkmimage-nodeps sdnod

system_dlkmimage-nodeps sdnod: | $(INTERNAL_USERIMAGES_DEPS)

	$(build-system_dlkmimage-target)

core/os_licensing.mk

+14 −22
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ endif 


$(call declare-0p-target,$(target_notice_file_xml_gz))

$(call declare-0p-target,$(installed_notice_html_or_xml_gz))

ALL_DEFAULT_INSTALLED_MODULES += $(installed_notice_html_or_xml_gz)

endif



.PHONY: vendorlicense
@@ -35,18 +34,17 @@ VENDOR_NOTICE_DEPS += $(UNMOUNTED_NOTICE_DEPS) 


$(eval $(call text-notice-rule,$(target_vendor_notice_file_txt),"Vendor image", \

         "Notices for files contained in all filesystem images except system/system_ext/product/odm/vendor_dlkm/odm_dlkm in this directory:", \

         $(VENDOR_NOTICE_DEPS)))

         $(VENDOR_NOTICE_DEPS),$(VENDOR_NOTICE_DEPS)))



$(eval $(call xml-notice-rule,$(target_vendor_notice_file_xml_gz),"Vendor image", \

         "Notices for files contained in all filesystem images except system/system_ext/product/odm/vendor_dlkm/odm_dlkm in this directory:", \

         $(VENDOR_NOTICE_DEPS)))

         $(VENDOR_NOTICE_DEPS),$(VENDOR_NOTICE_DEPS)))



$(installed_vendor_notice_xml_gz): $(target_vendor_notice_file_xml_gz)

	$(copy-file-to-target)



$(call declare-0p-target,$(target_vendor_notice_file_xml_gz))

$(call declare-0p-target,$(installed_vendor_notice_xml_gz))

ALL_DEFAULT_INSTALLED_MODULES += $(installed_vendor_notice_xml_gz)

endif



.PHONY: odmlicense
@@ -55,18 +53,17 @@ odmlicense: $(call corresponding-license-metadata, $(ODM_NOTICE_DEPS)) reportmis 
ifneq (,$(ODM_NOTICE_DEPS))

$(eval $(call text-notice-rule,$(target_odm_notice_file_txt),"ODM filesystem image", \

         "Notices for files contained in the odm filesystem image in this directory:", \

         $(ODM_NOTICE_DEPS)))

         $(ODM_NOTICE_DEPS),$(ODM_NOTICE_DEPS)))



$(eval $(call xml-notice-rule,$(target_odm_notice_file_xml_gz),"ODM filesystem image", \

         "Notices for files contained in the odm filesystem image in this directory:", \

         $(ODM_NOTICE_DEPS)))

         $(ODM_NOTICE_DEPS),$(ODM_NOTICE_DEPS)))



$(installed_odm_notice_xml_gz): $(target_odm_notice_file_xml_gz)

	$(copy-file-to-target)



$(call declare-0p-target,$(target_odm_notice_file_xml_gz))

$(call declare-0p-target,$(installed_odm_notice_xml_gz))

ALL_DEFAULT_INSTALLED_MODULES += $(installed_odm_notice_xml_gz)

endif



.PHONY: oemlicense
@@ -78,18 +75,17 @@ productlicense: $(call corresponding-license-metadata, $(PRODUCT_NOTICE_DEPS)) r 
ifneq (,$(PRODUCT_NOTICE_DEPS))

$(eval $(call text-notice-rule,$(target_product_notice_file_txt),"Product image", \

         "Notices for files contained in the product filesystem image in this directory:", \

         $(PRODUCT_NOTICE_DEPS)))

         $(PRODUCT_NOTICE_DEPS),$(PRODUCT_NOTICE_DEPS)))



$(eval $(call xml-notice-rule,$(target_product_notice_file_xml_gz),"Product image", \

         "Notices for files contained in the product filesystem image in this directory:", \

         $(PRODUCT_NOTICE_DEPS)))

         $(PRODUCT_NOTICE_DEPS),$(PRODUCT_NOTICE_DEPS)))



$(installed_product_notice_xml_gz): $(target_product_notice_file_xml_gz)

	$(copy-file-to-target)



$(call declare-0p-target,$(target_product_notice_file_xml_gz))

$(call declare-0p-target,$(installed_product_notice_xml_gz))

ALL_DEFAULT_INSTALLED_MODULES += $(installed_product_notice_xml_gz)

endif



.PHONY: systemextlicense
@@ -98,18 +94,17 @@ systemextlicense: $(call corresponding-license-metadata, $(SYSTEM_EXT_NOTICE_DEP 
ifneq (,$(SYSTEM_EXT_NOTICE_DEPS))

$(eval $(call text-notice-rule,$(target_system_ext_notice_file_txt),"System_ext image", \

         "Notices for files contained in the system_ext filesystem image in this directory:", \

         $(SYSTEM_EXT_NOTICE_DEPS)))

         $(SYSTEM_EXT_NOTICE_DEPS),$(SYSTEM_EXT_NOTICE_DEPS)))



$(eval $(call xml-notice-rule,$(target_system_ext_notice_file_xml_gz),"System_ext image", \

         "Notices for files contained in the system_ext filesystem image in this directory:", \

         $(SYSTEM_EXT_NOTICE_DEPS)))

         $(SYSTEM_EXT_NOTICE_DEPS),$(SYSTEM_EXT_NOTICE_DEPS)))



$(installed_system_ext_notice_xml_gz): $(target_system_ext_notice_file_xml_gz)

	$(copy-file-to-target)



$(call declare-0p-target,$(target_system_ext_notice_file_xml_gz))

$(call declare-0p-target,$(installed_system_ext_notice_xml_gz))

ALL_DEFAULT_INSTALLED_MODULES += $(installed_system_ext_notice_xml_gz)

endif



.PHONY: vendor_dlkmlicense
@@ -118,18 +113,17 @@ vendor_dlkmlicense: $(call corresponding-license-metadata, $(VENDOR_DLKM_NOTICE_ 
ifneq (,$(VENDOR_DLKM_NOTICE_DEPS))

$(eval $(call text-notice-rule,$(target_vendor_dlkm_notice_file_txt),"Vendor_dlkm image", \

         "Notices for files contained in the vendor_dlkm filesystem image in this directory:", \

         $(VENDOR_DLKM_NOTICE_DEPS)))

         $(VENDOR_DLKM_NOTICE_DEPS),$(VENDOR_DLKM_NOTICE_DEPS)))



$(eval $(call xml-notice-rule,$(target_vendor_dlkm_notice_file_xml_gz),"Vendor_dlkm image", \

         "Notices for files contained in the vendor_dlkm filesystem image in this directory:", \

         $(VENDOR_DLKM_NOTICE_DEPS)))

         $(VENDOR_DLKM_NOTICE_DEPS),$(VENDOR_DLKM_NOTICE_DEPS)))



$(installed_vendor_dlkm_notice_xml_gz): $(target_vendor_dlkm_notice_file_xml_gz)

	$(copy-file-to-target)



$(call declare-0p-target,$(target_vendor_dlkm_notice_file_xml_gz))

$(call declare-0p-target,$(installed_vendor_dlkm_notice_xml_gz))

ALL_DEFAULT_INSTALLED_MODULES += $(installed_vendor_dlkm_notice_xml_gz)

endif



.PHONY: odm_dlkmlicense
@@ -138,18 +132,17 @@ odm_dlkmlicense: $(call corresponding-license-metadata, $(ODM_DLKM_NOTICE_DEPS)) 
ifneq (,$(ODM_DLKM_NOTICE_DEPS))

$(eval $(call text-notice-rule,$(target_odm_dlkm_notice_file_txt),"ODM_dlkm filesystem image", \

         "Notices for files contained in the odm_dlkm filesystem image in this directory:", \

         $(ODM_DLKM_NOTICE_DEPS)))

         $(ODM_DLKM_NOTICE_DEPS),$(ODM_DLKM_NOTICE_DEPS)))



$(eval $(call xml-notice-rule,$(target_odm_dlkm_notice_file_xml_gz),"ODM_dlkm filesystem image", \

         "Notices for files contained in the odm_dlkm filesystem image in this directory:", \

         $(ODM_DLMK_NOTICE_DEPS)))

         $(ODM_DLKM_NOTICE_DEPS),$(ODM_DLKM_NOTICE_DEPS)))



$(installed_odm_dlkm_notice_xml_gz): $(target_odm_dlkm_notice_file_xml_gz)

	$(copy-file-to-target)



$(call declare-0p-target,$(target_odm_dlkm_notice_file_xml_gz))

$(call declare-0p-target,$(installed_odm_dlkm_notice_xml_gz))

ALL_DEFAULT_INSTALLED_MODULES += $(installed_odm_dlkm_notice_xml_gz)

endif



.PHONY: system_dlkmlicense
@@ -158,18 +151,17 @@ system_dlkmlicense: $(call corresponding-license-metadata, $(SYSTEM_DLKM_NOTICE_ 
ifneq (,$(SYSTEM_DLKM_NOTICE_DEPS))

$(eval $(call text-notice-rule,$(target_system_dlkm_notice_file_txt),"System_dlkm filesystem image", \

         "Notices for files contained in the system_dlkm filesystem image in this directory:", \

         $(SYSTEM_DLKM_NOTICE_DEPS)))

         $(SYSTEM_DLKM_NOTICE_DEPS),$(SYSTEM_DLKM_NOTICE_DEPS)))



$(eval $(call xml-notice-rule,$(target_system_dlkm_notice_file_xml_gz),"System_dlkm filesystem image", \

         "Notices for files contained in the system_dlkm filesystem image in this directory:", \

         $(SYSTEM_DLMK_NOTICE_DEPS)))

         $(SYSTEM_DLKM_NOTICE_DEPS),$(SYSTEM_DLKM_NOTICE_DEPS)))



$(installed_system_dlkm_notice_xml_gz): $(target_system_dlkm_notice_file_xml_gz)

	$(copy-file-to-target)



$(call declare-0p-target,$(target_system_dlkm_notice_file_xml_gz))

$(call declare-0p-target,$(installed_sysetm_dlkm_notice_xml_gz))

ALL_DEFAULT_INSTALLED_MODULES += $(installed_system_dlkm_notice_xml_gz)

endif



endif # not TARGET_BUILD_APPS