From 870b7f37b317133b54e6d493ab018fa4be421664 Mon Sep 17 00:00:00 2001 From: Paul Scovanner Date: Wed, 27 Jul 2022 21:53:43 +0000 Subject: [PATCH 1/4] Update Security String to 2022-09-05 Bug: 238435977 Change-Id: Ibcc1999668338bdfa888c52d3e3a0ccb6b0bf5e1 (cherry picked from commit d041329fa01f4f963dc9ac15e4ab2e8313b8c70a) Merged-In: Ibcc1999668338bdfa888c52d3e3a0ccb6b0bf5e1 --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 65957c8859..5883925c73 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,7 @@ ifndef PLATFORM_SECURITY_PATCH # It must be of the form "YYYY-MM-DD" on production devices. # It must match one of the Android Security Patch Level strings of the Public Security Bulletins. # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2022-08-05 + PLATFORM_SECURITY_PATCH := 2022-09-05 endif include $(BUILD_SYSTEM)/version_util.mk From bb8ed77cfb8dc413549b8f36afccd38dd4358a7f Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Tue, 2 Aug 2022 17:46:48 +0000 Subject: [PATCH 2/4] Fix missing notices. Move ALL_DEFAULT_INSTALLED_MODULES assignments back into Makefile Fix typos DLMK -> DLKM Bug: 240582127 Test: m droid dist Test: tapas google-tradefed-all && m dist Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_x86 TARGET_BUILD_VARIANT=eng droid dist checkbuild Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_x86_64 TARGET_BUILD_VARIANT=userdebug droid dist checkbuild Change-Id: If780669602c459c337585e9d2c4915b28844e2bb Merged-in: If780669602c459c337585e9d2c4915b28844e2bb (cherry picked from commit d92266638145c2420af606de66c159cdb75a4c4e) Merged-In: If780669602c459c337585e9d2c4915b28844e2bb --- core/Makefile | 62 ++++++++++++++++++++++++++++++++++++++++++++ core/os_licensing.mk | 36 ++++++++++--------------- 2 files changed, 76 insertions(+), 22 deletions(-) diff --git a/core/Makefile b/core/Makefile index de9fd52c12..309a179ee0 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1688,6 +1688,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 @@ -3879,6 +3936,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) diff --git a/core/os_licensing.mk b/core/os_licensing.mk index d8d3c78945..416e4b22af 100644 --- a/core/os_licensing.mk +++ b/core/os_licensing.mk @@ -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 From 84dddd207be8d2ccff11a40f35076f1a5f656421 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Tue, 9 Aug 2022 08:05:20 +0000 Subject: [PATCH 3/4] Version bump to TP1A.220905.003 [core/build_id.mk] Change-Id: I7aaca3432e00d525ef733d3c64347e2618340601 --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 09c2b3fbe7..e368e35464 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID=TP1A.220905.002 +BUILD_ID=TP1A.220905.003 From 26508656cdfed09beedc330fbe4c441267bd4ae3 Mon Sep 17 00:00:00 2001 From: Android Build Coastguard Worker Date: Wed, 10 Aug 2022 01:42:59 +0000 Subject: [PATCH 4/4] Version bump to TP1A.220905.004 [core/build_id.mk] Change-Id: I29b1fb2c92ac438aa0ca469929390f4fd40bc7b1 --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e368e35464..bb7ca9fe74 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID=TP1A.220905.003 +BUILD_ID=TP1A.220905.004