diff options
| author | Yifan Hong <elsk@google.com> | 2018-02-01 15:19:23 -0800 |
|---|---|---|
| committer | Yifan Hong <elsk@google.com> | 2018-02-05 20:33:03 +0000 |
| commit | 8731aa1bb3746237dee43ec93b86340e56fd9aa4 (patch) | |
| tree | 4d672ef8760eebef520ff5d63fd57bbd44e0ed06 /vintfdata | |
| parent | ffdad0f74cd21ecffbda27726c54c60874462438 (diff) | |
| download | libhidl-8731aa1bb3746237dee43ec93b86340e56fd9aa4.tar.gz | |
Install empty device matrix when missing.
Test: build with target that does not have DEVICE_MATRIX_FILE defined
Bug: 67974785
Change-Id: I61077b6a3699bd028c92c4e60d24a499bec725ad
Diffstat (limited to 'vintfdata')
| -rw-r--r-- | vintfdata/Android.mk | 9 | ||||
| -rw-r--r-- | vintfdata/device_compatibility_matrix.default.xml | 10 |
2 files changed, 17 insertions, 2 deletions
diff --git a/vintfdata/Android.mk b/vintfdata/Android.mk index 22201fa..bc7a55a 100644 --- a/vintfdata/Android.mk +++ b/vintfdata/Android.mk @@ -30,6 +30,11 @@ endif # Device Compatibility Matrix ifdef DEVICE_MATRIX_FILE +DEVICE_MATRIX_INPUT_FILE := $(DEVICE_MATRIX_FILE) +else +DEVICE_MATRIX_INPUT_FILE := $(LOCAL_PATH)/device_compatibility_matrix.default.xml +endif + include $(CLEAR_VARS) LOCAL_MODULE := device_compatibility_matrix.xml LOCAL_MODULE_STEM := compatibility_matrix.xml @@ -39,7 +44,7 @@ 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): $(DEVICE_MATRIX_FILE) $(HOST_OUT_EXECUTABLES)/assemble_vintf +$(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 $@ @@ -47,7 +52,6 @@ $(GEN): $(DEVICE_MATRIX_FILE) $(HOST_OUT_EXECUTABLES)/assemble_vintf LOCAL_PREBUILT_MODULE_FILE := $(GEN) include $(BUILD_PREBUILT) BUILT_VENDOR_MATRIX := $(LOCAL_BUILT_MODULE) -endif # Framework Manifest include $(CLEAR_VARS) @@ -82,3 +86,4 @@ BUILT_SYSTEM_MANIFEST := $(LOCAL_BUILT_MODULE) VINTF_VNDK_VERSION := FRAMEWORK_MANIFEST_INPUT_FILES := +DEVICE_MATRIX_INPUT_FILE := diff --git a/vintfdata/device_compatibility_matrix.default.xml b/vintfdata/device_compatibility_matrix.default.xml new file mode 100644 index 0000000..eaa513e --- /dev/null +++ b/vintfdata/device_compatibility_matrix.default.xml @@ -0,0 +1,10 @@ +<compatibility-matrix version="1.0" type="device"> + <hal format="hidl" optional="false"> + <name>android.hidl.manager</name> + <version>1.0</version> + <interface> + <name>IServiceManager</name> + <instance>default</instance> + </interface> + </hal> +</compatibility-matrix> |