Allow multiple DEVICE_MATRIX_FILE

Test: define multiple entries in DEVICE_MATRIX_FILE and build,
      then lshal
Bug: 130714844

Change-Id: Idb8e7eff81720bbd3705597d532f6a8306214db2
Merged-In: Idb8e7eff81720bbd3705597d532f6a8306214db2
diff --git a/vintfdata/Android.mk b/vintfdata/Android.mk
index 232ef6f..0c0651f 100644
--- a/vintfdata/Android.mk
+++ b/vintfdata/Android.mk
@@ -48,10 +48,13 @@
 GEN := $(local-generated-sources-dir)/compatibility_matrix.xml
 
 $(GEN): PRIVATE_VINTF_VNDK_VERSION := $(VINTF_VNDK_VERSION)
+$(GEN): PRIVATE_DEVICE_MATRIX_INPUT_FILE := $(DEVICE_MATRIX_INPUT_FILE)
 $(GEN): $(DEVICE_MATRIX_INPUT_FILE) $(HOST_OUT_EXECUTABLES)/assemble_vintf
 	REQUIRED_VNDK_VERSION=$(PRIVATE_VINTF_VNDK_VERSION) \
 	BOARD_SYSTEMSDK_VERSIONS="$(BOARD_SYSTEMSDK_VERSIONS)" \
-		$(HOST_OUT_EXECUTABLES)/assemble_vintf -i $< -o $@
+		$(HOST_OUT_EXECUTABLES)/assemble_vintf \
+		-i $(call normalize-path-list,$(PRIVATE_DEVICE_MATRIX_INPUT_FILE)) \
+		-o $@
 
 LOCAL_PREBUILT_MODULE_FILE := $(GEN)
 include $(BUILD_PREBUILT)
@@ -81,4 +84,4 @@
 
 VINTF_VNDK_VERSION :=
 FRAMEWORK_MANIFEST_INPUT_FILES :=
-DEVICE_MATRIX_INPUT_FILE :=
\ No newline at end of file
+DEVICE_MATRIX_INPUT_FILE :=