Merge "Verify updatable jars are in PRODUCT_BOOT_JARS"

am: 68209e4519

Change-Id: I4227cb1b8f98761b228a9c112f32aa3e12d9208e
This commit is contained in:
Anton Hansson 2019-12-16 07:18:22 -08:00 committed by android-build-merger
commit 0403c44566

View file

@ -264,6 +264,13 @@ ifdef PRODUCT_DEFAULT_DEV_CERTIFICATE
endif
endif
$(foreach pair,$(PRODUCT_UPDATABLE_BOOT_JARS), \
$(if $(findstring $(call word-colon,2,$(pair)),$(PRODUCT_BOOT_JARS)),, \
$(error Every jar in PRODUCT_UPDATABLE_BOOT_JARS must also be in PRODUCT_BOOT_JARS, \
$(call word-colon,2,$(pair)) is not) \
) \
)
ENFORCE_SYSTEM_CERTIFICATE := $(PRODUCT_ENFORCE_ARTIFACT_SYSTEM_CERTIFICATE_REQUIREMENT)
ENFORCE_SYSTEM_CERTIFICATE_WHITELIST := $(PRODUCT_ARTIFACT_SYSTEM_CERTIFICATE_REQUIREMENT_WHITELIST)