commit 1a60691cf7fcfd9227881294e7d9c149dda0642c
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jun 09 16:06:46 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 09 16:06:46 2020 +0000
tree 02250834bb599c966abc8b2172be4124f6d48d0a
parent fc2db6d9e2e6abcc91127224ca69142a2b9c8446
parent eef35f9a19854b1bdfdbb151ec910351255e5d42

Merge "Move system SDK versions to system manifest"

vintfdata/Android.mk

diff --git a/vintfdata/Android.mk b/vintfdata/Android.mk
index bca1cdc..d873e29 100644
--- a/vintfdata/Android.mk
+++ b/vintfdata/Android.mk
@@ -77,6 +77,7 @@
 
 $(GEN): PRIVATE_SYSTEM_MANIFEST_INPUT_FILES := $(SYSTEM_MANIFEST_INPUT_FILES)
 $(GEN): $(SYSTEM_MANIFEST_INPUT_FILES) $(HOST_OUT_EXECUTABLES)/assemble_vintf
+	PLATFORM_SYSTEMSDK_VERSIONS="$(PLATFORM_SYSTEMSDK_VERSIONS)" \
 		$(HOST_OUT_EXECUTABLES)/assemble_vintf \
 		-i $(call normalize-path-list,$(PRIVATE_SYSTEM_MANIFEST_INPUT_FILES)) \
 		-o $@
@@ -115,7 +116,6 @@
 $(GEN): PRIVATE_VINTF_VNDK_VERSION := $(VINTF_VNDK_VERSION)
 $(GEN): $(SYSTEM_EXT_MANIFEST_INPUT_FILES) $(HOST_OUT_EXECUTABLES)/assemble_vintf
 	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_SYSTEM_EXT_MANIFEST_FILES)) \
 		-o $@