summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-06-10 01:34:47 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-10 01:34:47 +0000
commitb9f2501e37863768c266afbaa43c7460c04ce655 (patch)
treec37f3b0470a20ebef49a1bb8d5808e3ca8b224ca
parent4c9607f794a183dfdd744124efc3eee4b2b5d5e9 (diff)
parent09ba3e27125e125bdf9aedefd07c46b7493c5277 (diff)
downloadplatform_system_libhidl-b9f2501e37863768c266afbaa43c7460c04ce655.tar.gz
platform_system_libhidl-b9f2501e37863768c266afbaa43c7460c04ce655.tar.bz2
platform_system_libhidl-b9f2501e37863768c266afbaa43c7460c04ce655.zip
Snap for 6573866 from 1fd1de9c7a638e04ac6cbd42165ba83bd7b0a04b to rvc-release am: 09ba3e2712
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/libhidl/+/11816794 Change-Id: I08bee7601c2db0717778fa24223f9fa85db57245
-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 $@