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

Commit 4796a953 authored by Jiyong Park's avatar Jiyong Park Committed by Automerger Merge Worker
Browse files

Merge "Remove ndk_platform backend. Use the ndk backend." am: 5384f937 am:... 

Merge "Remove ndk_platform backend. Use the ndk backend." am: 5384f937 am: d4d73288 am: 406e39f4

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

Change-Id: I53113783fb13be68261d541ca343a56fe1064d47
parents d6da069e 406e39f4

gatekeeperd/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ cc_binary { 
        "libhidlbase",

        "android.hardware.gatekeeper@1.0",

        "libgatekeeper_aidl",

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

        "android.security.authorization-ndk_platform",

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

        "android.security.authorization-ndk",

    ],



    static_libs: ["libscrypt_static"],

trusty/keymaster/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -106,9 +106,9 @@ cc_binary { 
        "keymint/service.cpp",

    ],

    shared_libs: [

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

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

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

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

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

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

        "lib_android_keymaster_keymint_utils",

        "libbase",

        "libbinder_ndk",