Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 579e7bae authored by Nataniel Borges's avatar Nataniel Borges Committed by Automerger Merge Worker
Browse files

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

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

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



Change-Id: Ice894d6fbc5d79b384ca5d7d33832f5675df4383
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents caaedb0a a10ed15f

compatibility_matrices/Android.mk

+1 −9
Original line number Diff line number Diff line
@@ -103,16 +103,8 @@ my_system_matrix_deps := \ 
    framework_compatibility_matrix.6.xml \

    framework_compatibility_matrix.7.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 \



endif

    framework_compatibility_matrix.device.xml \



my_framework_matrix_deps += \

    $(my_system_matrix_deps)

compatibility_matrices/compatibility_matrix.8.xml

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ 
            <instance>default</instance>

        </interface>

    </hal>

    <hal format="aidl" optional="true" updatable-via-apex="true">

    <hal format="aidl" optional="true">

        <name>android.hardware.biometrics.fingerprint</name>

        <version>2</version>

        <interface>