Merge "Products launching with API 28 needs system-as-root"

am: 1f7bf445e7 Change-Id: I61d89c55ace0c2373f4c883c167ba5378e960d14
2018-03-27 03:51:29 +00:00
parent d60f6cbea7 1f7bf445e7
commit 9bbc647458
1 changed files with 5 additions and 0 deletions
--- a/core/config.mk
+++ b/core/config.mk
@@ -843,6 +843,11 @@ ifdef PRODUCT_SHIPPING_API_LEVEL
        $(error When PRODUCT_SHIPPING_API_LEVEL >= 28, TARGET_USES_64_BIT_BINDER must be true)
      endif
    endif
+    ifeq ($(PRODUCT_FULL_TREBLE),true)
+      ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE), true)
+        $(error When PRODUCT_SHIPPING_API_LEVEL >= 28, BOARD_BUILD_SYSTEM_ROOT_IMAGE must be true)
+      endif
+    endif
  endif
 endif