commit 0403c4456654a7bf9b2fc008dab629e77a86e883
author Anton Hansson <hansson@google.com> Mon Dec 16 07:18:22 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Dec 16 07:18:22 2019 -0800
tree f2a6f0595231e9dc2d7fa82aacd0dee7140d285e
parent 132c0346e22e9d726d0f1ecc2ddc4918f1fb3d83
parent 68209e45198db7e2413f98218723fab31337ca8a

Merge "Verify updatable jars are in  PRODUCT_BOOT_JARS"
am: 68209e4519

Change-Id: I4227cb1b8f98761b228a9c112f32aa3e12d9208e

core/product_config.mk

diff --git a/core/product_config.mk b/core/product_config.mk
index 4fc7bf6..afe91d4 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -264,6 +264,13 @@
   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)