diff options
| author | Yifan Hong <elsk@google.com> | 2019-04-22 14:07:23 -0700 |
|---|---|---|
| committer | Yifan Hong <elsk@google.com> | 2019-04-22 14:07:23 -0700 |
| commit | f2211cd3bca4938ab2c6ce41712fc9263e7ae7ce (patch) | |
| tree | 97882e3edffb03d0c9f67764b7660e71ce125e3f | |
| parent | 0b6d39d2bbf3c52f9242d8195fd77deb7ac9334c (diff) | |
| download | libhidl-f2211cd3bca4938ab2c6ce41712fc9263e7ae7ce.tar.gz | |
Allow multiple DEVICE_MATRIX_FILE
Test: define multiple entries in DEVICE_MATRIX_FILE and build,
then lshal
Bug: 130714844
Change-Id: Idb8e7eff81720bbd3705597d532f6a8306214db2
| -rw-r--r-- | vintfdata/Android.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/vintfdata/Android.mk b/vintfdata/Android.mk index 3db7065..78351fe 100644 --- a/vintfdata/Android.mk +++ b/vintfdata/Android.mk @@ -44,10 +44,13 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc/vintf 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) @@ -77,4 +80,4 @@ BUILT_SYSTEM_MANIFEST := $(LOCAL_BUILT_MODULE) VINTF_VNDK_VERSION := FRAMEWORK_MANIFEST_INPUT_FILES := -DEVICE_MATRIX_INPUT_FILE :=
\ No newline at end of file +DEVICE_MATRIX_INPUT_FILE := |