From 69ae572779c14c40dccef29af958f6dcd85acb0f Mon Sep 17 00:00:00 2001 From: Justin Yun Date: Wed, 7 Feb 2018 16:16:59 +0900 Subject: [PATCH] PRODUCT_TREBLE_LINKER_NAMESPACES must be true for BOARD_VNDK_VERSION If PRODUCT_TREBLE_LINKER_NAMESPACES is not true when BOARD_VNDK_VERSION is defined, report a build error. To enable VNDK, linker namespace must be configured. Bug: 72704254 Test: Try to build with one of them is missing Change-Id: I804704e2f48fa44c8f998183508741d5cc40e4ce --- core/config.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/core/config.mk b/core/config.mk index e9b5d4c35..b6175d85f 100644 --- a/core/config.mk +++ b/core/config.mk @@ -819,6 +819,14 @@ $(KATI_obsolete_var PRODUCT_USE_VNDK_OVERRIDE,Use PRODUCT_USE_VNDK instead) .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)