commit f65e68c079b25cb2553667c6ceaf79e422858ead
author Sundong Ahn <sundongahn@google.com> Tue Oct 24 01:29:39 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 24 01:29:39 2017 +0000
tree 76f91fd21fb747584cd3f61d68f37be0f531212f
parent fea5545ffce1100d4f5f9fbc00790e5b65e2c5f6
parent 505ed24fbc1422098396d6a1154e7d92ed8c22b3

Merge "Add ro.vndk.version property" am: 9d3d271673
am: 505ed24fbc

Change-Id: I99511660b5b93b0f2d47e61f917efbac3141ab11

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 97ae198..2e9d4dd 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -149,6 +149,11 @@
 INSTALLED_VENDOR_DEFAULT_PROP_TARGET := $(TARGET_OUT_VENDOR)/default.prop
 ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_VENDOR_DEFAULT_PROP_TARGET)
 
+ifdef BOARD_VNDK_VERSION
+FINAL_VENDOR_DEFAULT_PROPERTIES := ro.vndk.version=${BOARD_VNDK_VERSION}
+else
+FINAL_VENDOR_DEFAULT_PROPERTIES :=
+endif
 FINAL_VENDOR_DEFAULT_PROPERTIES += \
     $(call collapse-pairs, $(PRODUCT_DEFAULT_PROPERTY_OVERRIDES))
 FINAL_VENDOR_DEFAULT_PROPERTIES := $(call uniq-pairs-by-first-component, \