Merge "Error if BOARD_VNDK_VERSION=PLATFORM_VNDK_VERSION"

2020-07-01 00:27:44 +00:00
parent 6c9441a924 2b0b3d1491
commit b9a27f4e7d
1 changed files with 3 additions and 0 deletions
--- a/core/board_config.mk
+++ b/core/board_config.mk
@@ -593,6 +593,9 @@ define check_vndk_version
 endef

 ifdef BOARD_VNDK_VERSION
+  ifeq ($(BOARD_VNDK_VERSION),$(PLATFORM_VNDK_VERSION))
+    $(error BOARD_VNDK_VERSION is equal to PLATFORM_VNDK_VERSION; use BOARD_VNDK_VERSION := current))
+  endif
  ifneq ($(BOARD_VNDK_VERSION),current)
    $(call check_vndk_version,$(BOARD_VNDK_VERSION))
  endif