commit c859b0a6b2ef3a6a3023df1868e626ee00ab39c2
author Justin Yun <justinyun@google.com> Thu May 16 06:31:48 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu May 16 06:31:48 2019 -0700
tree 952f9fbe1ab3a5d2110c635269354b4b08fcca36
parent 813f0a975c956aa073a867becece8a57cbf8c8bd
parent 916b368b2f49f4126d4d4218de807cc44732b317

Merge "Allow overriding PRODUCT_EXTRA_VNDK_VERSIONS" am: 2faec12c07
am: 916b368b2f

Change-Id: I83f2a5b53d0bd53aef74b72c7e4f515907d85b63

core/product_config.mk

diff --git a/core/product_config.mk b/core/product_config.mk
index 5ba69a6..cb58cf4 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -384,6 +384,15 @@
   endif
 endif
 
+# If build command defines OVERRIDE_PRODUCT_EXTRA_VNDK_VERSIONS,
+# override PRODUCT_EXTRA_VNDK_VERSIONS with it.
+ifdef OVERRIDE_PRODUCT_EXTRA_VNDK_VERSIONS
+  PRODUCT_EXTRA_VNDK_VERSIONS := $(OVERRIDE_PRODUCT_EXTRA_VNDK_VERSIONS)
+endif
+
+$(KATI_obsolete_var OVERRIDE_PRODUCT_EXTRA_VNDK_VERSIONS \
+    ,Use PRODUCT_EXTRA_VNDK_VERSIONS instead)
+
 define product-overrides-config
 $$(foreach rule,$$(PRODUCT_$(1)_OVERRIDES),\
     $$(if $$(filter 2,$$(words $$(subst :,$$(space),$$(rule)))),,\