commit b923abfb740799a0d966f1138183fe91e207ae5c
author Kiyoung Kim <kiyoungkim@google.com> Tue Feb 20 23:45:29 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 20 23:45:29 2024 +0000
tree d6bca0b79afa1199015dcc3fc1cad6aacce3ea58
parent de6ca0f77bf4e149a581f5c974488cec3738444b
parent d58a10656a5cc6fc1d9fe50bbfbfd20401ef1471

BugFix: Always set PRIVATE_PROVIDED_VNDK_VERSIONS am: d58a10656a

Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/2967203

Change-Id: Ic44cbea17d6ebf501466b774dd644e9da33021ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

vintfdata/Android.mk

diff --git a/vintfdata/Android.mk b/vintfdata/Android.mk
index 6a5fe72..49e1733 100644
--- a/vintfdata/Android.mk
+++ b/vintfdata/Android.mk
@@ -147,18 +147,11 @@
 $(GEN): PRIVATE_PROVIDED_VNDK_VERSIONS := \
   $(sort $(VINTF_VNDK_VERSION) $(PRODUCT_EXTRA_VNDK_VERSIONS))
 
-ifeq ($(PRIVATE_PROVIDED_VNDK_VERSIONS),)
-$(GEN): $(SYSTEM_EXT_MANIFEST_INPUT_FILES) $(HOST_OUT_EXECUTABLES)/assemble_vintf
-	$(HOST_OUT_EXECUTABLES)/assemble_vintf \
-		-i $(call normalize-path-list,$(PRIVATE_SYSTEM_EXT_MANIFEST_FILES)) \
-		-o $@
-else
 $(GEN): $(SYSTEM_EXT_MANIFEST_INPUT_FILES) $(HOST_OUT_EXECUTABLES)/assemble_vintf
 	PROVIDED_VNDK_VERSIONS="$(PRIVATE_PROVIDED_VNDK_VERSIONS)" \
 	$(HOST_OUT_EXECUTABLES)/assemble_vintf \
 		-i $(call normalize-path-list,$(PRIVATE_SYSTEM_EXT_MANIFEST_FILES)) \
 		-o $@
-endif
 
 LOCAL_PREBUILT_MODULE_FILE := $(GEN)
 include $(BUILD_PREBUILT)