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

Commit bafcb977 authored by Devin Moore's avatar Devin Moore Committed by Gerrit Code Review
Browse files

Merge changes from topic "upstream_next_vintf_v1" into main 

* changes:
  Remove compatibility_matrix.9.xml from 'next' builds
  Mark some HALs as updatable-via-apex retroactively
parents 0ff72a91 f45d423a

compatibility_matrices/Android.mk

+7 −1
Original line number Diff line number Diff line
@@ -106,9 +106,15 @@ my_system_matrix_deps := \ 
    framework_compatibility_matrix.6.xml \

    framework_compatibility_matrix.7.xml \

    framework_compatibility_matrix.8.xml \

    framework_compatibility_matrix.9.xml \

    framework_compatibility_matrix.device.xml \



# Only allow the use of the unreleased compatibility matrix when we can use unfrozen

# interfaces (in the `next` release configuration).

ifeq ($(RELEASE_AIDL_USE_UNFROZEN),true)

my_system_matrix_deps += \

    framework_compatibility_matrix.9.xml

endif



my_framework_matrix_deps += \

    $(my_system_matrix_deps)

compatibility_matrices/compatibility_matrix.8.xml

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

        </interface>

    </hal>

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

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

         <name>android.hardware.authsecret</name>

         <version>1</version>

         <interface>
@@ -123,7 +123,7 @@ 
            <instance>virtual</instance>

        </interface>

    </hal>

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

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

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

        <version>3</version>

        <interface>
@@ -314,7 +314,7 @@ 
            <instance>default</instance>

        </interface>

    </hal>

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

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

        <name>android.hardware.security.keymint</name>

        <version>1-3</version>

        <interface>
@@ -323,7 +323,7 @@ 
            <instance>strongbox</instance>

        </interface>

    </hal>

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

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

        <name>android.hardware.security.keymint</name>

        <version>1-3</version>

        <interface>
@@ -532,7 +532,7 @@ 
            <regex-instance>SIM[1-9][0-9]*</regex-instance>

        </interface>

    </hal>

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

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

        <name>android.hardware.security.secureclock</name>

        <version>1</version>

        <interface>
@@ -540,7 +540,7 @@ 
            <instance>default</instance>

        </interface>

    </hal>

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

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

        <name>android.hardware.security.sharedsecret</name>

        <version>1</version>

        <interface>
@@ -692,7 +692,7 @@ 
            <instance>default</instance>

        </interface>

    </hal>

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

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

        <name>android.hardware.uwb</name>

        <version>1</version>

        <interface>