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

Commit f48a2a7b authored by Tri Vo's avatar Tri Vo
Browse files

Bump Identity and KM AIDL API versions 

Imported interfaces are versioned, i.e. bumping an interface version
necessiates bumping the version of importing interfaces.

Keystore and Identity import KM. We are uprevving KM, so all three need
to be bumped at the same time.

Test: m
Change-Id: I46b253e72f2f245bd628ed2ae1f2f4e0572827e7
parent a682b181

compatibility_matrices/compatibility_matrix.current.xml

+3 −3
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ 
    </hal>

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

        <name>android.hardware.identity</name>

        <version>1-4</version>

        <version>1-5</version>

        <interface>

            <name>IIdentityCredentialStore</name>

            <instance>default</instance>
@@ -399,7 +399,7 @@ 
    </hal>

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

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

        <version>1-2</version>

        <version>1-3</version>

        <interface>

            <name>IKeyMintDevice</name>

            <instance>default</instance>
@@ -408,7 +408,7 @@ 
    </hal>

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

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

        <version>1-2</version>

        <version>1-3</version>

        <interface>

            <name>IRemotelyProvisionedComponent</name>

            <instance>default</instance>

confirmationui/aidl/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ aidl_interface { 
    name: "android.hardware.confirmationui",

    vendor_available: true,

    imports: [

        "android.hardware.security.keymint-V2",

        "android.hardware.security.keymint-V3",

    ],

    srcs: ["android/hardware/confirmationui/*.aidl"],

    stability: "vintf",

gatekeeper/aidl/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ aidl_interface { 
    name: "android.hardware.gatekeeper",

    vendor_available: true,

    imports: [

        "android.hardware.security.keymint-V2",

        "android.hardware.security.keymint-V3",

    ],

    srcs: ["android/hardware/gatekeeper/*.aidl"],

    stability: "vintf",

identity/aidl/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ aidl_interface { 
        "android/hardware/identity/*.aidl",

    ],

    imports: [

        "android.hardware.keymaster",

        "android.hardware.keymaster-V3",

        "android.hardware.security.keymint",

    ],

    stability: "vintf",
@@ -66,20 +66,20 @@ aidl_interface { 
cc_defaults {

    name: "identity_use_latest_hal_aidl_ndk_static",

    static_libs: [

        "android.hardware.identity-V4-ndk",

        "android.hardware.identity-V5-ndk",

    ],

}



cc_defaults {

    name: "identity_use_latest_hal_aidl_ndk_shared",

    shared_libs: [

        "android.hardware.identity-V4-ndk",

        "android.hardware.identity-V5-ndk",

    ],

}



cc_defaults {

    name: "identity_use_latest_hal_aidl_cpp_static",

    static_libs: [

        "android.hardware.identity-V4-cpp",

        "android.hardware.identity-V5-cpp",

    ],

}

security/keymint/aidl/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -52,21 +52,21 @@ aidl_interface { 
cc_defaults {

    name: "keymint_use_latest_hal_aidl_ndk_static",

    static_libs: [

        "android.hardware.security.keymint-V2-ndk",

        "android.hardware.security.keymint-V3-ndk",

    ],

}



cc_defaults {

    name: "keymint_use_latest_hal_aidl_ndk_shared",

    shared_libs: [

        "android.hardware.security.keymint-V2-ndk",

        "android.hardware.security.keymint-V3-ndk",

    ],

}



cc_defaults {

    name: "keymint_use_latest_hal_aidl_cpp_static",

    static_libs: [

        "android.hardware.security.keymint-V2-cpp",

        "android.hardware.security.keymint-V3-cpp",

    ],

}
@@ -76,6 +76,6 @@ cc_defaults { 
rust_defaults {

    name: "keymint_use_latest_hal_aidl_rust",

    rustlibs: [

        "android.hardware.security.keymint-V2-rust",

        "android.hardware.security.keymint-V3-rust",

    ],

}