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

Commit 8a5a7039 authored by David Drysdale's avatar David Drysdale Committed by Automerger Merge Worker
Browse files

Merge "Depend on KeyMint HAL via default" am: 93f4b0af 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1904171

Change-Id: Iac644b8ff00d19cb13e1ce9853b7fe2ad4a342a0
parents d22ff3b3 93f4b0af

gatekeeperd/Android.bp

+3 −2
Original line number Diff line number Diff line
@@ -29,7 +29,9 @@ cc_binary { 
    srcs: [

        "gatekeeperd.cpp",

    ],



    defaults: [

        "keymint_use_latest_hal_aidl_ndk_shared",

    ],

    shared_libs: [

        "libbinder",

        "libbinder_ndk",
@@ -43,7 +45,6 @@ cc_binary { 
        "libhidlbase",

        "android.hardware.gatekeeper@1.0",

        "libgatekeeper_aidl",

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

        "android.security.authorization-ndk",

    ],

trusty/keymaster/Android.bp

+3 −1
Original line number Diff line number Diff line
@@ -105,8 +105,10 @@ cc_binary { 
        "keymint/TrustySharedSecret.cpp",

        "keymint/service.cpp",

    ],

    defaults: [

        "keymint_use_latest_hal_aidl_ndk_shared",

    ],

    shared_libs: [

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

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

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

        "lib_android_keymaster_keymint_utils",