Add notice files for odm_dlkm am: c83f9e922b am: 2c3f849f65
Original change: https://android-review.googlesource.com/c/platform/build/+/1363860 Change-Id: I913270bc0b5582d7222e07991e1992a2d964920c
This commit is contained in:
Yifan Hong
Automerger Merge Worker
commit
2b60d6ddbf
|
|
@ -902,9 +902,10 @@ endif # BUILDING_VENDOR_BOOT_IMAGE
|
|||
.PHONY: notice_files
|
||||
|
||||
# Create the rule to combine the files into text and html/xml forms
|
||||
# $(1) - xml_excluded_system_product_odm_vendor_dlkm|
|
||||
# xml_excluded_vendor_product_odm_vendor_dlkm|
|
||||
# xml_product|xml_odm|xml_system_ext|xml_system|xml_vendor_dlkm|html
|
||||
# $(1) - xml_excluded_system_product_odm_vendor_dlkm_odm_dlkm|
|
||||
# xml_excluded_vendor_product_odm_vendor_dlkm_odm_dlkm|
|
||||
# xml_product|xml_odm|xml_system_ext|xml_system|xml_vendor_dlkm|
|
||||
# xml_odm_dlkm|html
|
||||
# $(2) - Plain text output file
|
||||
# $(3) - HTML/XML output file
|
||||
# $(4) - File title
|
||||
|
|
@ -930,14 +931,15 @@ $(2): PRIVATE_DIR := $(5)
|
|||
$(2): .KATI_IMPLICIT_OUTPUTS := $(3)
|
||||
$(2): $(6) $(BUILD_SYSTEM)/Makefile build/make/tools/generate-notice-files.py
|
||||
build/make/tools/generate-notice-files.py --text-output $(2) $(foreach xdir, $(7), -e $(xdir) )\
|
||||
$(if $(filter $(1),xml_excluded_vendor_product_odm_vendor_dlkm),-e vendor -e product -e system_ext -e odm -e vendor_dlkm --xml-output, \
|
||||
$(if $(filter $(1),xml_excluded_system_product_odm_vendor_dlkm),-e system -e product -e system_ext -e odm -e vendor_dlkm --xml-output, \
|
||||
$(if $(filter $(1),xml_excluded_vendor_product_odm_vendor_dlkm_odm_dlkm),-e vendor -e product -e system_ext -e odm -e vendor_dlkm -e odm_dlkm --xml-output, \
|
||||
$(if $(filter $(1),xml_excluded_system_product_odm_vendor_dlkm_odm_dlkm),-e system -e product -e system_ext -e odm -e vendor_dlkm -e odm_dlkm --xml-output, \
|
||||
$(if $(filter $(1),xml_product),-i product --xml-output, \
|
||||
$(if $(filter $(1),xml_system_ext),-i system_ext --xml-output, \
|
||||
$(if $(filter $(1),xml_system),-i system --xml-output, \
|
||||
$(if $(filter $(1),xml_odm),-i odm --xml-output, \
|
||||
$(if $(filter $(1),xml_vendor_dlkm),-i vendor_dlkm --xml-output, \
|
||||
--html-output))))))) $(3) \
|
||||
$(if $(filter $(1),xml_odm_dlkm),-i odm_dlkm --xml-output, \
|
||||
--html-output)))))))) $(3) \
|
||||
-t $$(PRIVATE_MESSAGE) -s $$(PRIVATE_DIR)/src
|
||||
notice_files: $(2) $(3)
|
||||
endef
|
||||
|
|
@ -1006,6 +1008,11 @@ target_vendor_dlkm_notice_file_xml := $(TARGET_OUT_INTERMEDIATES)/NOTICE_VENDOR_
|
|||
target_vendor_dlkm_notice_file_xml_gz := $(TARGET_OUT_INTERMEDIATES)/NOTICE_VENDOR_DLKM.xml.gz
|
||||
installed_vendor_dlkm_notice_xml_gz := $(TARGET_OUT_VENDOR_DLKM)/etc/NOTICE.xml.gz
|
||||
|
||||
target_odm_dlkm_notice_file_txt := $(TARGET_OUT_INTERMEDIATES)/NOTICE_ODM_DLKM.txt
|
||||
target_odm_dlkm_notice_file_xml := $(TARGET_OUT_INTERMEDIATES)/NOTICE_ODM_DLKM.xml
|
||||
target_odm_dlkm_notice_file_xml_gz := $(TARGET_OUT_INTERMEDIATES)/NOTICE_ODM_DLKM.xml.gz
|
||||
installed_odm_dlkm_notice_xml_gz := $(TARGET_OUT_ODM_DLKM)/etc/NOTICE.xml.gz
|
||||
|
||||
# Notice files are copied to TARGET_OUT_NOTICE_FILES as a side-effect of their module
|
||||
# being built. A notice xml file must depend on all modules that could potentially
|
||||
# install a license file relevant to it.
|
||||
|
|
@ -1016,7 +1023,7 @@ license_modules := $(filter $(PRODUCT_OUT)/%,$(license_modules))
|
|||
license_modules := $(filter-out $(TARGET_OUT_FAKE)/%,$(license_modules))
|
||||
# testcases are not relevant to the system image.
|
||||
license_modules := $(filter-out $(TARGET_OUT_TESTCASES)/%,$(license_modules))
|
||||
# filesystem images: system, vendor, product, system_ext, odm, and vendor_dlkm
|
||||
# filesystem images: system, vendor, product, system_ext, odm, vendor_dlkm, and odm_dlkm
|
||||
license_modules_system := $(filter $(TARGET_OUT)/%,$(license_modules))
|
||||
# system_other is relevant to system partition.
|
||||
license_modules_system += $(filter $(TARGET_OUT_SYSTEM_OTHER)/%,$(license_modules))
|
||||
|
|
@ -1025,12 +1032,14 @@ license_modules_product := $(filter $(TARGET_OUT_PRODUCT)/%,$(license_modules))
|
|||
license_modules_system_ext := $(filter $(TARGET_OUT_SYSTEM_EXT)/%,$(license_modules))
|
||||
license_modules_odm := $(filter $(TARGET_OUT_ODM)/%,$(license_modules))
|
||||
license_modules_vendor_dlkm := $(filter $(TARGET_OUT_VENDOR_DLKM)/%,$(license_modules))
|
||||
license_modules_odm_dlkm := $(filter $(TARGET_OUT_ODM_DLKM)/%,$(license_modules))
|
||||
license_modules_agg := $(license_modules_system) \
|
||||
$(license_modules_vendor) \
|
||||
$(license_modules_product) \
|
||||
$(license_modules_system_ext) \
|
||||
$(license_modules_odm) \
|
||||
$(license_modules_vendor_dlkm)
|
||||
$(license_modules_vendor_dlkm) \
|
||||
$(license_modules_odm_dlkm)
|
||||
# targets used for debug symbols only and do not get copied to the device
|
||||
license_modules_symbols_only := $(filter $(PRODUCT_OUT)/apex/%,$(license_modules))
|
||||
|
||||
|
|
@ -1065,8 +1074,8 @@ $(call maybe-print-list-and-error, $(license_modules_rest), \
|
|||
# update its notice file, so include those notices in the system partition instead
|
||||
ifdef BOARD_PREBUILT_VENDORIMAGE
|
||||
license_modules_system += $(license_modules_rehomed)
|
||||
system_xml_directories := xml_excluded_vendor_product_odm_vendor_dlkm
|
||||
system_notice_file_message := "Notices for files contained in all filesystem images except vendor/system_ext/product/odm/vendor_dlkm in this directory:"
|
||||
system_xml_directories := xml_excluded_vendor_product_odm_vendor_dlkm_odm_dlkm
|
||||
system_notice_file_message := "Notices for files contained in all filesystem images except vendor/system_ext/product/odm/vendor_dlkm/odm_dlkm in this directory:"
|
||||
else
|
||||
license_modules_vendor += $(license_modules_rehomed)
|
||||
system_xml_directories := xml_system
|
||||
|
|
@ -1080,10 +1089,10 @@ $(eval $(call combine-notice-files, $(system_xml_directories), \
|
|||
$(TARGET_OUT_NOTICE_FILES), \
|
||||
$(license_modules_system), \
|
||||
$(exclude_target_dirs)))
|
||||
$(eval $(call combine-notice-files, xml_excluded_system_product_odm_vendor_dlkm, \
|
||||
$(eval $(call combine-notice-files, xml_excluded_system_product_odm_vendor_dlkm_odm_dlkm, \
|
||||
$(target_vendor_notice_file_txt), \
|
||||
$(target_vendor_notice_file_xml), \
|
||||
"Notices for files contained in all filesystem images except system/system_ext/product/odm/vendor_dlkm in this directory:", \
|
||||
"Notices for files contained in all filesystem images except system/system_ext/product/odm/vendor_dlkm/odm_dlkm in this directory:", \
|
||||
$(TARGET_OUT_NOTICE_FILES), \
|
||||
$(license_modules_vendor), \
|
||||
$(exclude_target_dirs)))
|
||||
|
|
@ -1115,6 +1124,13 @@ $(eval $(call combine-notice-files, xml_vendor_dlkm, \
|
|||
$(TARGET_OUT_NOTICE_FILES), \
|
||||
$(license_modules_vendor_dlkm), \
|
||||
$(exclude_target_dirs)))
|
||||
$(eval $(call combine-notice-files, xml_odm_dlkm, \
|
||||
$(target_odm_dlkm_notice_file_txt), \
|
||||
$(target_odm_dlkm_notice_file_xml), \
|
||||
"Notices for files contained in the odm_dlkm filesystem image in this directory:", \
|
||||
$(TARGET_OUT_NOTICE_FILES), \
|
||||
$(license_modules_odm_dlkm), \
|
||||
$(exclude_target_dirs)))
|
||||
|
||||
$(target_notice_file_xml_gz): $(target_notice_file_xml) | $(MINIGZIP)
|
||||
$(hide) $(MINIGZIP) -9 < $< > $@
|
||||
|
|
@ -1128,6 +1144,8 @@ $(target_odm_notice_file_xml_gz): $(target_odm_notice_file_xml) | $(MINIGZIP)
|
|||
$(hide) $(MINIGZIP) -9 < $< > $@
|
||||
$(target_vendor_dlkm_notice_file_xml_gz): $(target_vendor_dlkm_notice_file_xml) | $(MINIGZIP)
|
||||
$(hide) $(MINIGZIP) -9 < $< > $@
|
||||
$(target_odm_dlkm_notice_file_xml_gz): $(target_odm_dlkm_notice_file_xml) | $(MINIGZIP)
|
||||
$(hide) $(MINIGZIP) -9 < $< > $@
|
||||
$(installed_notice_html_or_xml_gz): $(target_notice_file_xml_gz)
|
||||
$(copy-file-to-target)
|
||||
$(installed_vendor_notice_xml_gz): $(target_vendor_notice_file_xml_gz)
|
||||
|
|
@ -1140,6 +1158,8 @@ $(installed_odm_notice_xml_gz): $(target_odm_notice_file_xml_gz)
|
|||
$(copy-file-to-target)
|
||||
$(installed_vendor_dlkm_notice_xml_gz): $(target_vendor_dlkm_notice_file_xml_gz)
|
||||
$(copy-file-to-target)
|
||||
$(installed_odm_dlkm_notice_xml_gz): $(target_odm_dlkm_notice_file_xml_gz)
|
||||
$(copy-file-to-target)
|
||||
|
||||
ALL_DEFAULT_INSTALLED_MODULES += $(installed_notice_html_or_xml_gz)
|
||||
ALL_DEFAULT_INSTALLED_MODULES += $(installed_vendor_notice_xml_gz)
|
||||
|
|
@ -1147,6 +1167,7 @@ ALL_DEFAULT_INSTALLED_MODULES += $(installed_product_notice_xml_gz)
|
|||
ALL_DEFAULT_INSTALLED_MODULES += $(installed_system_ext_notice_xml_gz)
|
||||
ALL_DEFAULT_INSTALLED_MODULES += $(installed_odm_notice_xml_gz)
|
||||
ALL_DEFAULT_INSTALLED_MODULES += $(installed_vendor_dlkm_notice_xml_gz)
|
||||
ALL_DEFAULT_INSTALLED_MODULES += $(installed_odm_dlkm_notice_xml_gz)
|
||||
endif # PRODUCT_NOTICE_SPLIT
|
||||
|
||||
ALL_DEFAULT_INSTALLED_MODULES += $(installed_notice_html_or_xml_gz)
|
||||
|
|
|
|||
Loading…
Reference in New Issue