BugFix: Always set PRIVATE_PROVIDED_VNDK_VERSIONS
Previous change tried to set PRIVATE_PROVIDED_VNDK_VERSIONS
conditionally if it is not empty. However, defining
PRIVATE_PROVIDED_VNDK_VERSIONS is part of build action, so it is not
accessible with ifeq command. Also as this is env variable, build works
even when it is empty. This change would again set
PRIVATE_PROVIDED_VNDK_VERSIONS even if it is empty to cover any build
errors with PRODUCT_EXTRA_VNDK_VERSIONS.
Bug: 316829758
Test: AOSP CF build succeeded
Test: AOSP Husky build succeeded
Change-Id: Ie86996f15a928d048bfe983f4c94be5719ce02e7
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)