commit c4d2725fc68bb0c472b992358ec7d298b1cb287b
author Yifan Hong <elsk@google.com> Tue Jan 23 02:57:29 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 23 02:57:29 2018 +0000
tree 24208c2d73f16e4eeafd88c9bbc725ed32bf0512
parent 9b8fc9e3c2150fcbb25c23003e548025a3a6c315
parent 5ff1f0a38ac4abd68bffd132fc4eae36866f91b2

Merge "Add System SDK Versions to VINTF."

target/board/Android.mk

diff --git a/target/board/Android.mk b/target/board/Android.mk
index 1c9edb8..9b2620c 100644
--- a/target/board/Android.mk
+++ b/target/board/Android.mk
@@ -73,6 +73,7 @@
 $(GEN): PRIVATE_VINTF_VNDK_VERSION := $(VINTF_VNDK_VERSION)
 $(GEN): $(DEVICE_MATRIX_FILE) $(HOST_OUT_EXECUTABLES)/assemble_vintf
 	REQUIRED_VNDK_VERSION=$(PRIVATE_VINTF_VNDK_VERSION) \
+	BOARD_SYSTEMSDK_VERSIONS="$(BOARD_SYSTEMSDK_VERSIONS)" \
 		$(HOST_OUT_EXECUTABLES)/assemble_vintf -i $< -o $@
 
 LOCAL_PREBUILT_MODULE_FILE := $(GEN)
@@ -103,6 +104,7 @@
 $(GEN): $(FRAMEWORK_MANIFEST_INPUT_FILES) $(HOST_OUT_EXECUTABLES)/assemble_vintf
 	BOARD_SEPOLICY_VERS=$(BOARD_SEPOLICY_VERS) \
 	PROVIDED_VNDK_VERSIONS="$(PRIVATE_VINTF_VNDK_VERSION) $(PRODUCT_EXTRA_VNDK_VERSIONS)" \
+	PLATFORM_SYSTEMSDK_VERSIONS="$(PLATFORM_SYSTEMSDK_VERSIONS)" \
 		$(HOST_OUT_EXECUTABLES)/assemble_vintf \
 		-i $(call normalize-path-list,$(PRIVATE_FRAMEWORK_MANIFEST_INPUT_FILES)) \
 		-o $@ $(PRIVATE_FLAGS)