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

Commit 5f789249 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Replace secretkeeper_comm_nostd->secretkeeper_core_nostd" into main am:... 

Merge "Replace secretkeeper_comm_nostd->secretkeeper_core_nostd" into main am: 05585eb7 am: 98c6489c

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



Change-Id: I17a2c391286f3d21c60b71d8e6b3a0f1c85ed511
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 35f551b9 98c6489c

security/secretkeeper/default/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ rust_binary { 
        "libauthgraph_hal",

        "libbinder_rs",

        "liblog_rust",

        "libsecretkeeper_comm_nostd",

        "libsecretkeeper_core_nostd",

        "libsecretkeeper_hal",

    ],

    srcs: [

security/secretkeeper/default/src/main.rs

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ use std::sync::{Arc, Mutex}; 
use authgraph_boringssl as boring;

use authgraph_core::ta::{Role, AuthGraphTa};

use authgraph_core::keyexchange::{MAX_OPENED_SESSIONS, AuthGraphParticipant};

use secretkeeper_comm::ta::SecretkeeperTa;

use secretkeeper_core::ta::SecretkeeperTa;

use secretkeeper_hal::SecretkeeperService;

use authgraph_hal::channel::SerializedChannel;

use android_hardware_security_secretkeeper::aidl::android::hardware::security::secretkeeper::ISecretkeeper::{