tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Reland: Generate fs-verity build manifst APK for other partitions"

Browse source
This commit is contained in:
Victor Hsieh 2022-09-15 21:49:43 +00:00 committed by Gerrit Code Review
commit 90195c958d
2 changed files with 106 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

145
core/Makefile
View file

@ -599,8 +599,16 @@ $(APKCERTS_FILE):
$(if $(PACKAGES.$(p).EXTERNAL_KEY),\ $(if $(PACKAGES.$(p).EXTERNAL_KEY),\
$(call _apkcerts_write_line,$(PACKAGES.$(p).STEM),EXTERNAL,,$(PACKAGES.$(p).COMPRESSED),$(PACKAGES.$(p).PARTITION),$@),\ $(call _apkcerts_write_line,$(PACKAGES.$(p).STEM),EXTERNAL,,$(PACKAGES.$(p).COMPRESSED),$(PACKAGES.$(p).PARTITION),$@),\
$(call _apkcerts_write_line,$(PACKAGES.$(p).STEM),$(PACKAGES.$(p).CERTIFICATE),$(PACKAGES.$(p).PRIVATE_KEY),$(PACKAGES.$(p).COMPRESSED),$(PACKAGES.$(p).PARTITION),$@)))) $(call _apkcerts_write_line,$(PACKAGES.$(p).STEM),$(PACKAGES.$(p).CERTIFICATE),$(PACKAGES.$(p).PRIVATE_KEY),$(PACKAGES.$(p).COMPRESSED),$(PACKAGES.$(p).PARTITION),$@))))
$(if $(filter true,$(PRODUCT_SYSTEM_FSVERITY_GENERATE_METADATA)),\ $(if $(filter true,$(PRODUCT_FSVERITY_GENERATE_METADATA)),\
$(call _apkcerts_write_line,$(notdir $(basename $(FSVERITY_APK_OUT))),$(FSVERITY_APK_KEY_PATH).x509.pem,$(FSVERITY_APK_KEY_PATH).pk8,,system,$@)) $(call _apkcerts_write_line,BuildManifest,$(FSVERITY_APK_KEY_PATH).x509.pem,$(FSVERITY_APK_KEY_PATH).pk8,,system,$@) \
$(if $(filter true,$(BUILDING_SYSTEM_EXT_IMAGE)),\
$(call _apkcerts_write_line,BuildManifestSystemExt,$(FSVERITY_APK_KEY_PATH).x509.pem,$(FSVERITY_APK_KEY_PATH).pk8,,system_ext,$@)) \
$(if $(filter true,$(BUILDING_VENDOR_IMAGE)),\
$(call _apkcerts_write_line,BuildManifestVendor,$(FSVERITY_APK_KEY_PATH).x509.pem,$(FSVERITY_APK_KEY_PATH).pk8,,vendor,$@)) \
$(if $(filter true,$(BUILDING_ODM_IMAGE)),\
$(call _apkcerts_write_line,BuildManifestOdm,$(FSVERITY_APK_KEY_PATH).x509.pem,$(FSVERITY_APK_KEY_PATH).pk8,,odm,$@)) \
$(if $(filter true,$(BUILDING_PRODUCT_IMAGE)),\
$(call _apkcerts_write_line,BuildManifestProduct,$(FSVERITY_APK_KEY_PATH).x509.pem,$(FSVERITY_APK_KEY_PATH).pk8,,product,$@)))
# In case value of PACKAGES is empty. # In case value of PACKAGES is empty.
$(hide) touch $@ $(hide) touch $@
@ -2933,21 +2941,35 @@ $1
endef endef
# -----------------------------------------------------------------
# system image
# FSVerity metadata generation # FSVerity metadata generation
# Generate fsverity metadata files (.fsv_meta) and build manifest # Generate fsverity metadata files (.fsv_meta) and build manifest
# (system/etc/security/fsverity/BuildManifest.apk) BEFORE filtering systemimage files below # (<partition>/etc/security/fsverity/BuildManifest<suffix>.apk) BEFORE filtering systemimage,
ifeq ($(PRODUCT_SYSTEM_FSVERITY_GENERATE_METADATA),true) # vendorimage, odmimage, productimage files below.
ifeq ($(PRODUCT_FSVERITY_GENERATE_METADATA),true)
# Generate fsv_meta fsverity-metadata-targets-patterns := \
fsverity-metadata-targets := $(sort $(filter \
$(TARGET_OUT)/framework/% \ $(TARGET_OUT)/framework/% \
$(TARGET_OUT)/etc/boot-image.prof \ $(TARGET_OUT)/etc/boot-image.prof \
$(TARGET_OUT)/etc/dirty-image-objects \ $(TARGET_OUT)/etc/dirty-image-objects \
$(TARGET_OUT)/etc/preloaded-classes \ $(TARGET_OUT)/etc/preloaded-classes \
$(TARGET_OUT)/etc/classpaths/%.pb, \ $(TARGET_OUT)/etc/classpaths/%.pb \
ifdef BUILDING_SYSTEM_EXT_IMAGE
fsverity-metadata-targets-patterns += $(TARGET_OUT_SYSTEM_EXT)/framework/%
endif
ifdef BUILDING_VENDOR_IMAGE
fsverity-metadata-targets-patterns += $(TARGET_OUT_VENDOR)/framework/%
endif
ifdef BUILDING_ODM_IMAGE
fsverity-metadata-targets-patterns += $(TARGET_OUT_ODM)/framework/%
endif
ifdef BUILDING_PRODUCT_IMAGE
fsverity-metadata-targets-patterns += $(TARGET_OUT_PRODUCT)/framework/%
endif
# Generate fsv_meta
fsverity-metadata-targets := $(sort $(filter \
$(fsverity-metadata-targets-patterns), \
$(ALL_DEFAULT_INSTALLED_MODULES))) $(ALL_DEFAULT_INSTALLED_MODULES)))
define fsverity-generate-metadata define fsverity-generate-metadata
@ -2961,47 +2983,80 @@ endef
$(foreach f,$(fsverity-metadata-targets),$(eval $(call fsverity-generate-metadata,$(f)))) $(foreach f,$(fsverity-metadata-targets),$(eval $(call fsverity-generate-metadata,$(f))))
ALL_DEFAULT_INSTALLED_MODULES += $(addsuffix .fsv_meta,$(fsverity-metadata-targets)) ALL_DEFAULT_INSTALLED_MODULES += $(addsuffix .fsv_meta,$(fsverity-metadata-targets))
# Generate BuildManifest.apk
FSVERITY_APK_KEY_PATH := $(DEFAULT_SYSTEM_DEV_CERTIFICATE) FSVERITY_APK_KEY_PATH := $(DEFAULT_SYSTEM_DEV_CERTIFICATE)
FSVERITY_APK_OUT := $(TARGET_OUT)/etc/security/fsverity/BuildManifest.apk FSVERITY_APK_MANIFEST_TEMPLATE_PATH := system/security/fsverity/AndroidManifest.xml
FSVERITY_APK_MANIFEST_PATH := system/security/fsverity/AndroidManifest.xml
$(FSVERITY_APK_OUT): PRIVATE_FSVERITY := $(HOST_OUT_EXECUTABLES)/fsverity # Generate and install BuildManifest<suffix>.apk for the given partition
$(FSVERITY_APK_OUT): PRIVATE_AAPT2 := $(HOST_OUT_EXECUTABLES)/aapt2 # $(1): path of the output APK
$(FSVERITY_APK_OUT): PRIVATE_MIN_SDK_VERSION := $(DEFAULT_APP_TARGET_SDK) # $(2): partition name
$(FSVERITY_APK_OUT): PRIVATE_VERSION_CODE := $(PLATFORM_SDK_VERSION) define fsverity-generate-and-install-manifest-apk
$(FSVERITY_APK_OUT): PRIVATE_VERSION_NAME := $(APPS_DEFAULT_VERSION_NAME) fsverity-metadata-targets-$(2) := $(filter $(PRODUCT_OUT)/$(2)/%,\
$(FSVERITY_APK_OUT): PRIVATE_APKSIGNER := $(HOST_OUT_EXECUTABLES)/apksigner $(fsverity-metadata-targets))
$(FSVERITY_APK_OUT): PRIVATE_MANIFEST := $(FSVERITY_APK_MANIFEST_PATH) $(1): PRIVATE_FSVERITY := $(HOST_OUT_EXECUTABLES)/fsverity
$(FSVERITY_APK_OUT): PRIVATE_FRAMEWORK_RES := $(call intermediates-dir-for,APPS,framework-res,,COMMON)/package-export.apk $(1): PRIVATE_AAPT2 := $(HOST_OUT_EXECUTABLES)/aapt2
$(FSVERITY_APK_OUT): PRIVATE_KEY := $(FSVERITY_APK_KEY_PATH) $(1): PRIVATE_MIN_SDK_VERSION := $(DEFAULT_APP_TARGET_SDK)
$(FSVERITY_APK_OUT): PRIVATE_INPUTS := $(fsverity-metadata-targets) $(1): PRIVATE_VERSION_CODE := $(PLATFORM_SDK_VERSION)
$(FSVERITY_APK_OUT): PRIVATE_ASSETS := $(call intermediates-dir-for,ETC,build_manifest)/assets $(1): PRIVATE_VERSION_NAME := $(APPS_DEFAULT_VERSION_NAME)
$(FSVERITY_APK_OUT): $(HOST_OUT_EXECUTABLES)/fsverity_manifest_generator \ $(1): PRIVATE_APKSIGNER := $(HOST_OUT_EXECUTABLES)/apksigner
$(1): PRIVATE_MANIFEST := $(FSVERITY_APK_MANIFEST_TEMPLATE_PATH)
$(1): PRIVATE_FRAMEWORK_RES := $(call intermediates-dir-for,APPS,framework-res,,COMMON)/package-export.apk
$(1): PRIVATE_KEY := $(FSVERITY_APK_KEY_PATH)
$(1): PRIVATE_INPUTS := $$(fsverity-metadata-targets-$(2))
$(1): PRIVATE_ASSETS := $(call intermediates-dir-for,ETC,build_manifest-$(2))/assets
$(1): $(HOST_OUT_EXECUTABLES)/fsverity_manifest_generator \
$(HOST_OUT_EXECUTABLES)/fsverity $(HOST_OUT_EXECUTABLES)/aapt2 \ $(HOST_OUT_EXECUTABLES)/fsverity $(HOST_OUT_EXECUTABLES)/aapt2 \
$(HOST_OUT_EXECUTABLES)/apksigner $(FSVERITY_APK_MANIFEST_PATH) \ $(HOST_OUT_EXECUTABLES)/apksigner $(FSVERITY_APK_MANIFEST_TEMPLATE_PATH) \
$(FSVERITY_APK_KEY_PATH).x509.pem $(FSVERITY_APK_KEY_PATH).pk8 \ $(FSVERITY_APK_KEY_PATH).x509.pem $(FSVERITY_APK_KEY_PATH).pk8 \
$(call intermediates-dir-for,APPS,framework-res,,COMMON)/package-export.apk \ $(call intermediates-dir-for,APPS,framework-res,,COMMON)/package-export.apk \
$(fsverity-metadata-targets) $$(fsverity-metadata-targets-$(2))
rm -rf $(PRIVATE_ASSETS) rm -rf $$(PRIVATE_ASSETS)
mkdir -p $(PRIVATE_ASSETS) mkdir -p $$(PRIVATE_ASSETS)
$< --fsverity-path $(PRIVATE_FSVERITY) \ ifdef fsverity-metadata-targets-$(2)
--base-dir $(PRODUCT_OUT) \ $$< --fsverity-path $$(PRIVATE_FSVERITY) \
--output $(PRIVATE_ASSETS)/build_manifest.pb \ --base-dir $$(PRODUCT_OUT) \
$(PRIVATE_INPUTS) --output $$(PRIVATE_ASSETS)/build_manifest.pb \
$(PRIVATE_AAPT2) link -o $@ \ $$(PRIVATE_INPUTS)
-A $(PRIVATE_ASSETS) \ endif # fsverity-metadata-targets-$(2)
-I $(PRIVATE_FRAMEWORK_RES) \ $$(PRIVATE_AAPT2) link -o $$@ \
--min-sdk-version $(PRIVATE_MIN_SDK_VERSION) \ -A $$(PRIVATE_ASSETS) \
--version-code $(PRIVATE_VERSION_CODE) \ -I $$(PRIVATE_FRAMEWORK_RES) \
--version-name $(PRIVATE_VERSION_NAME) \ --min-sdk-version $$(PRIVATE_MIN_SDK_VERSION) \
--manifest $(PRIVATE_MANIFEST) --version-code $$(PRIVATE_VERSION_CODE) \
$(PRIVATE_APKSIGNER) sign --in $@ \ --version-name $$(PRIVATE_VERSION_NAME) \
--cert $(PRIVATE_KEY).x509.pem \ --manifest $$(PRIVATE_MANIFEST) \
--key $(PRIVATE_KEY).pk8 --rename-manifest-package com.android.security.fsverity_metadata.$(2)
$$(PRIVATE_APKSIGNER) sign --in $$@ \
--cert $$(PRIVATE_KEY).x509.pem \
--key $$(PRIVATE_KEY).pk8
ALL_DEFAULT_INSTALLED_MODULES += $(FSVERITY_APK_OUT) ALL_DEFAULT_INSTALLED_MODULES += $(1)
endif # PRODUCT_SYSTEM_FSVERITY_GENERATE_METADATA endef # fsverity-generate-and-install-manifest-apk
$(eval $(call fsverity-generate-and-install-manifest-apk, \
$(TARGET_OUT)/etc/security/fsverity/BuildManifest.apk,system))
ifdef BUILDING_SYSTEM_EXT_IMAGE
$(eval $(call fsverity-generate-and-install-manifest-apk, \
$(TARGET_OUT_SYSTEM_EXT)/etc/security/fsverity/BuildManifestSystemExt.apk,system_ext))
endif
ifdef BUILDING_VENDOR_IMAGE
$(eval $(call fsverity-generate-and-install-manifest-apk, \
$(TARGET_OUT_VENDOR)/etc/security/fsverity/BuildManifestVendor.apk,vendor))
endif
ifdef BUILDING_ODM_IMAGE
$(eval $(call fsverity-generate-and-install-manifest-apk, \
$(TARGET_OUT_ODM)/etc/security/fsverity/BuildManifestOdm.apk,odm))
endif
ifdef BUILDING_PRODUCT_IMAGE
$(eval $(call fsverity-generate-and-install-manifest-apk, \
$(TARGET_OUT_PRODUCT)/etc/security/fsverity/BuildManifestProduct.apk,product))
endif
endif # PRODUCT_FSVERITY_GENERATE_METADATA
# -----------------------------------------------------------------
# system image
INSTALLED_FILES_OUTSIDE_IMAGES := $(filter-out $(TARGET_OUT)/%, $(INSTALLED_FILES_OUTSIDE_IMAGES)) INSTALLED_FILES_OUTSIDE_IMAGES := $(filter-out $(TARGET_OUT)/%, $(INSTALLED_FILES_OUTSIDE_IMAGES))
INTERNAL_SYSTEMIMAGE_FILES := $(sort $(filter $(TARGET_OUT)/%, \ INTERNAL_SYSTEMIMAGE_FILES := $(sort $(filter $(TARGET_OUT)/%, \

15
core/product.mk
View file

@ -356,15 +356,12 @@ _product_single_value_vars += PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES
# This option is only meant to be set by compliance GSI targets. # This option is only meant to be set by compliance GSI targets.
_product_single_value_vars += PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT _product_single_value_vars += PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT
# If set, metadata files for the following artifacts will be generated. # If set, fsverity metadata files will be generated for each files in the
# - system/framework/*.jar # allowlist, plus an manifest APK per partition. For example,
# - system/framework/oat/<arch>/*.{oat,vdex,art} # /system/framework/service.jar will come with service.jar.fsv_meta in the same
# - system/etc/boot-image.prof # directory; the file information will also be included in
# - system/etc/dirty-image-objects # /system/etc/security/fsverity/BuildManifest.apk
# One fsverity metadata container file per one input file will be generated in _product_single_value_vars += PRODUCT_FSVERITY_GENERATE_METADATA
# system.img, with a suffix ".fsv_meta". e.g. a container file for
# "/system/framework/foo.jar" will be "system/framework/foo.jar.fsv_meta".
_product_single_value_vars += PRODUCT_SYSTEM_FSVERITY_GENERATE_METADATA
# If true, sets the default for MODULE_BUILD_FROM_SOURCE. This overrides # If true, sets the default for MODULE_BUILD_FROM_SOURCE. This overrides
# BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE but not an explicitly set value. # BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE but not an explicitly set value.