Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b598202b authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Verify updatable jars are in PRODUCT_BOOT_JARS" am: 68209e45 am: 0403c445

Change-Id: Idb2e33a16171cea6af44cd501c4f35ccdd73b81f
parents 423d1b9d 0403c445
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -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)