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

Remove fs-verity build manifest for vendor/odm/product

Browse source 
The build manifest APKs are recently added because we thought it's nicer
for ART to support beyond system_ext for potential partner
customizations.  Jiyong pointed out that having system server JARs
outside of system and system_ext may be a Treble violation. As a result,
delete some of those files.

Bug: 246000387
Bug: 245957815
Test: m; no longer seeing the files under out/
Change-Id: I4c5b118bd2277b5f3265ac4d3c2343cf929822c5
This commit is contained in:
Victor Hsieh 2022-09-20 11:46:09 -07:00
parent cfb5fb5227
commit adc94a151a
2 changed files with 7 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
core/Makefile
View file

@ -602,13 +602,7 @@ $(APKCERTS_FILE):
$(if $(filter true,$(PRODUCT_FSVERITY_GENERATE_METADATA)),\
$(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,$@)))
$(call _apkcerts_write_line,BuildManifestSystemExt,$(FSVERITY_APK_KEY_PATH).x509.pem,$(FSVERITY_APK_KEY_PATH).pk8,,system_ext,$@)))
# In case value of PACKAGES is empty.
$(hide) touch $@
@ -2957,15 +2951,6 @@ fsverity-metadata-targets-patterns := \
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 \
@ -3039,18 +3024,6 @@ 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

6
core/cleanspec.mk
View file

@ -58,6 +58,12 @@ INTERNAL_CLEAN_BUILD_VERSION := 6
#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
$(call add-clean-step, rm -rf $(OUT_DIR)/obj/ETC/build_manifest-vendor_intermediates)
$(call add-clean-step, rm -rf $(OUT_DIR)/obj/ETC/build_manifest-odm_intermediates)
$(call add-clean-step, rm -rf $(OUT_DIR)/obj/ETC/build_manifest-product_intermediates)
$(call add-clean-step, rm -rf $(TARGET_OUT_VENDOR)/etc/security/fsverity)
$(call add-clean-step, rm -rf $(TARGET_OUT_ODM)/etc/security/fsverity)
$(call add-clean-step, rm -rf $(TARGET_OUT_PRODUCT)/etc/security/fsverity)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST