Avoid adding duplicated VNDK versions
In the trunk stable next build, we may have duplication between
VINTF_VNDK_VERSION and PRODUCT_EXTRA_VNDK_VERSIONS. Using the sort
function, remove the duplicated versions from VINTF_VNDK_VERSION and
PRODUCT_EXTRA_VNDK_VERSIONS.
Bug: 299063181
Test: m system_ext_manifest.xml
Change-Id: I2b3e68cf8f1fd8d776036c54520e35e445cdd0d5
diff --git a/vintfdata/Android.mk b/vintfdata/Android.mk
index 4c5cca5..52a99ba 100644
--- a/vintfdata/Android.mk
+++ b/vintfdata/Android.mk
@@ -125,9 +125,10 @@
LOCAL_MODULE_RELATIVE_PATH := vintf
GEN := $(local-generated-sources-dir)/manifest.xml
$(GEN): PRIVATE_SYSTEM_EXT_MANIFEST_FILES := $(SYSTEM_EXT_MANIFEST_INPUT_FILES)
-$(GEN): PRIVATE_VINTF_VNDK_VERSION := $(VINTF_VNDK_VERSION)
+$(GEN): PRIVATE_PROVIDED_VNDK_VERSIONS := \
+ $(sort $(VINTF_VNDK_VERSION) $(PRODUCT_EXTRA_VNDK_VERSIONS))
$(GEN): $(SYSTEM_EXT_MANIFEST_INPUT_FILES) $(HOST_OUT_EXECUTABLES)/assemble_vintf
- PROVIDED_VNDK_VERSIONS="$(PRIVATE_VINTF_VNDK_VERSION) $(PRODUCT_EXTRA_VNDK_VERSIONS)" \
+ PROVIDED_VNDK_VERSIONS="$(PRIVATE_PROVIDED_VNDK_VERSIONS)" \
$(HOST_OUT_EXECUTABLES)/assemble_vintf \
-i $(call normalize-path-list,$(PRIVATE_SYSTEM_EXT_MANIFEST_FILES)) \
-o $@