commit 3a9118137b314b25c499e43e68c584b69de0e3a6
author Justin Yun <justinyun@google.com> Thu Feb 08 06:06:40 2018 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 08 06:06:40 2018 +0000
tree 343eb099e6871766a2b9e2be59b2119ee79bbd2b
parent c6b824ba9647581bef99e5d1b93fcfa600b6cbe0
parent 1e6b7c553a0b4a3de9dcffff20fca8d556565283

Merge "PRODUCT_TREBLE_LINKER_NAMESPACES must be true for BOARD_VNDK_VERSION"
am: 1e6b7c553a

Change-Id: I6a7b774c725814c865662e5dfbd06de65a41e781

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index e9b5d4c..b6175d8 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -819,6 +819,14 @@
 .KATI_READONLY := \
     PRODUCT_USE_VNDK
 
+# PRODUCT_TREBLE_LINKER_NAMESPACES must be true to define BOARD_VNDK_VERSION.
+ifdef BOARD_VNDK_VERSION
+  ifneq ($(PRODUCT_TREBLE_LINKER_NAMESPACES),true)
+    $(error PRODUCT_TREBLE_LINKER_NAMESPACES must be true \
+            if BOARD_VNDK_VERSION is defined)
+  endif
+endif
+
 ifdef PRODUCT_SHIPPING_API_LEVEL
   ifneq ($(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),27),)
     ifneq ($(TARGET_USES_MKE2FS),true)