commit 157f8f2c4ddd0e9d2df9c3b263c091fcb455851b
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Feb 22 00:24:57 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Feb 22 00:24:57 2024 +0000
tree 7c5f73d1f5d3374330e5c65bd3f5b2e9ef01b12c
parent 9859da2452239efd634fe7b1745a47b25f49141a
parent df06157cd41fb1e083228398c0d586689a68f3b4

Snap for 11479750 from df06157cd41fb1e083228398c0d586689a68f3b4 to 24Q3-release

Change-Id: I54a55d8d32821ae5d7b41fec9913e3f984056fbe

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)