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

Commit 7ec578b2 authored by Bob Badour's avatar Bob Badour Committed by Gerrit Code Review
Browse files

Merge "Revert "Fix missing notices.""

parents 3fe94592 18f8049d

core/Makefile

+0 −45
Original line number Diff line number Diff line
@@ -1686,46 +1686,6 @@ endif # PRODUCT_NOTICE_SPLIT 


ALL_DEFAULT_INSTALLED_MODULES += $(installed_notice_html_or_xml_gz)



ifneq (,$(installed_vendor_notice_xml_gz))

ALL_DEFAULT_INSTALLED_MODULES += $(installed_vendor_notice_xml_gz)

endif



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
@@ -3905,11 +3865,6 @@ $(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

+10 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 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
@@ -45,6 +46,7 @@ $(installed_vendor_notice_xml_gz): $(target_vendor_notice_file_xml_gz) 


$(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
@@ -64,6 +66,7 @@ $(installed_odm_notice_xml_gz): $(target_odm_notice_file_xml_gz) 


$(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
@@ -86,6 +89,7 @@ $(installed_product_notice_xml_gz): $(target_product_notice_file_xml_gz) 


$(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
@@ -105,6 +109,7 @@ $(installed_system_ext_notice_xml_gz): $(target_system_ext_notice_file_xml_gz) 


$(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
@@ -124,6 +129,7 @@ $(installed_vendor_dlkm_notice_xml_gz): $(target_vendor_dlkm_notice_file_xml_gz) 


$(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
@@ -136,13 +142,14 @@ $(eval $(call text-notice-rule,$(target_odm_dlkm_notice_file_txt),"ODM_dlkm file 


$(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_DLKM_NOTICE_DEPS)))

         $(ODM_DLMK_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
@@ -155,13 +162,14 @@ $(eval $(call text-notice-rule,$(target_system_dlkm_notice_file_txt),"System_dlk 


$(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_DLKM_NOTICE_DEPS)))

         $(SYSTEM_DLMK_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