commit eef35f9a19854b1bdfdbb151ec910351255e5d42
author Isaac Chen <ycchen@google.com> Mon Jun 01 15:00:23 2020 +0800
committer Isaac Chen <ycchen@google.com> Tue Jun 09 17:48:18 2020 +0800
tree 02250834bb599c966abc8b2172be4124f6d48d0a
parent 911852c231f779d1aee1e759c146e63f05e00d8f

Move system SDK versions to system manifest

Bug: 157870055
Test: $ lunch aosp_coral; m; m vintf
      # Flash the resulted images to a coral
      # On the Coral
      $ vintf
      # Verify system-sdk versions are correct
Change-Id: I651622d021a76175edfd97a08c6780a521230b17
Merged-In: I651622d021a76175edfd97a08c6780a521230b17
(cherry picked from commit 1fd1de9c7a638e04ac6cbd42165ba83bd7b0a04b)

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 $@