tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes from topic "revert-2649121-cm_vintf_workaround-PMVOGMKMBW" am: d74d81bf6e

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2648722

Change-Id: I26272360eb5856b9f92ab32f584e4ff70e568f39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Nataniel Borges 2023-07-06 12:32:57 +00:00 committed by Automerger Merge Worker
commit a10ed15f74
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
compatibility_matrices/Android.mk
View file

@ -103,16 +103,8 @@ my_system_matrix_deps := \
framework_compatibility_matrix.6.xml \ framework_compatibility_matrix.6.xml \
framework_compatibility_matrix.7.xml \ framework_compatibility_matrix.7.xml \
framework_compatibility_matrix.8.xml \ framework_compatibility_matrix.8.xml \
framework_compatibility_matrix.device.xml \
# Allow only cuttlefish to continue using matrix 9 HALs
# TODO(b/290060286) This is a temporary workaround for trunk stable and
# should be removed once interface versions can be flagged properly.
ifneq (,$(filter device/google/cuttlefish/shared/config/manifest.xml, $(DEVICE_MANIFEST_FILE)))
my_system_matrix_deps += \
framework_compatibility_matrix.9.xml \ framework_compatibility_matrix.9.xml \
framework_compatibility_matrix.device.xml \
endif
my_framework_matrix_deps += \ my_framework_matrix_deps += \
$(my_system_matrix_deps) $(my_system_matrix_deps)

2
compatibility_matrices/compatibility_matrix.8.xml
View file

@ -142,7 +142,7 @@
<instance>default</instance> <instance>default</instance>
</interface> </interface>
</hal> </hal>
<hal format="aidl" optional="true" updatable-via-apex="true"> <hal format="aidl" optional="true">
<name>android.hardware.biometrics.fingerprint</name> <name>android.hardware.biometrics.fingerprint</name>
<version>2</version> <version>2</version>
<interface> <interface>