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

Commit 57fd21d4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Specify version for aidl_interface explicitly" am: cb2ba409 am: 2e0eb52a 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3d6d6f9f6be327776b23a36a740a50db3138dbe
parents 1e63ebcd 2e0eb52a

security/keymint/aidl/default/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ cc_binary { 
    ],

    shared_libs: [

        "android.hardware.security.keymint-V1-ndk_platform",

        "android.hardware.security.sharedsecret-unstable-ndk_platform",

        "android.hardware.security.secureclock-unstable-ndk_platform",

        "android.hardware.security.sharedsecret-V1-ndk_platform",

        "android.hardware.security.secureclock-V1-ndk_platform",

        "libbase",

        "libbinder_ndk",

        "libcppbor_external",
@@ -39,7 +39,7 @@ cc_library { 
        "libkeymint_remote_prov_support",

    ],

    shared_libs: [

        "android.hardware.security.keymint-unstable-ndk_platform",

        "android.hardware.security.keymint-V1-ndk_platform",

        "libbinder_ndk",

        "libcppbor_external",

        "libcppcose",

security/keymint/aidl/vts/functional/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ cc_test { 
        "libpuresoftkeymasterdevice",

    ],

    static_libs: [

        "android.hardware.security.keymint-unstable-ndk_platform",

        "android.hardware.security.keymint-V1-ndk_platform",

        "libcppcose",

        "libgmock_ndk",

        "libremote_provisioner",

security/keymint/support/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -71,6 +71,6 @@ cc_library { 
    ],

    static_libs: [

        // TODO(swillden): Remove keymint NDK

        "android.hardware.security.keymint-unstable-ndk_platform",

        "android.hardware.security.keymint-V1-ndk_platform",

    ],

}

security/secureclock/aidl/vts/functional/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ cc_test { 
        "libkeymint",

    ],

    static_libs: [

        "android.hardware.security.keymint-unstable-ndk_platform",

        "android.hardware.security.secureclock-unstable-ndk_platform",

        "android.hardware.security.keymint-V1-ndk_platform",

        "android.hardware.security.secureclock-V1-ndk_platform",

    ],

    test_suites: [

        "general-tests",

security/sharedsecret/aidl/vts/functional/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ cc_test { 
        "libkeymint",

    ],

    static_libs: [

        "android.hardware.security.keymint-unstable-ndk_platform",

        "android.hardware.security.sharedsecret-unstable-ndk_platform",

        "android.hardware.security.keymint-V1-ndk_platform",

        "android.hardware.security.sharedsecret-V1-ndk_platform",

    ],

    test_suites: [

        "general-tests",