summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIsaac Chen <ycchen@google.com>2020-06-01 15:00:23 +0800
committerIsaac Chen <ycchen@google.com>2020-06-01 15:00:23 +0800
commit1fd1de9c7a638e04ac6cbd42165ba83bd7b0a04b (patch)
treec37f3b0470a20ebef49a1bb8d5808e3ca8b224ca
parentd3383780160424b570de74aaa073fff691e77647 (diff)
downloadplatform_system_libhidl-1fd1de9c7a638e04ac6cbd42165ba83bd7b0a04b.tar.gz
platform_system_libhidl-1fd1de9c7a638e04ac6cbd42165ba83bd7b0a04b.tar.bz2
platform_system_libhidl-1fd1de9c7a638e04ac6cbd42165ba83bd7b0a04b.zip
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
-rw-r--r--vintfdata/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/vintfdata/Android.mk b/vintfdata/Android.mk
index bca1cdca..d873e294 100644
--- a/vintfdata/Android.mk
+++ b/vintfdata/Android.mk
@@ -77,6 +77,7 @@ GEN := $(local-generated-sources-dir)/manifest.xml
$(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_SYSTEM_EXT_MANIFEST_FILES := $(SYSTEM_EXT_MANIFEST_INPUT_FILES)
$(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 $@