commit a723ee22774f38d1d5eb3a7d2e368149b74a328f
author Stephen Crane <cranes@google.com> Wed Jan 19 00:05:11 2022 +0000
committer Stephen Crane <cranes@google.com> Wed Jan 19 00:05:11 2022 +0000
tree d580544c29963c10b5f4ceb6716cc1b5d43b67a9
parent eb3bd5dfb91229956d7fca1d4bce05fba122cf90

Revert "[keystore2] Fix binder import path"

Revert "Update Rust binder import paths"

Revert "[binder_common] Update binder import path"

Revert "[binder] Expose public Rust API at crate top level"

Revert "[libprofcollectd] Fix binder import path"

Revert submission 1797473-binder_rs-public_api

Reason for revert: Build breakage
Reverted Changes:
Ia37ec9d1e:[binder_common] Update binder import path
Ie6b4a40d7:Update Rust binder import paths
Ia9695e549:[keystore2] Fix binder import path
I811426fa7:[binder] Expose public Rust API at crate top level...
I773767a3a:[libprofcollectd] Fix binder import path

Change-Id: I7f371c61749e17c54cc83689dc8a9793286adc4c

diced/src/error.rs

diff --git a/diced/src/error.rs b/diced/src/error.rs
index 3e230e4..92aa97c 100644
--- a/diced/src/error.rs
+++ b/diced/src/error.rs
@@ -14,7 +14,9 @@
 
 use android_security_dice::aidl::android::security::dice::ResponseCode::ResponseCode;
 use anyhow::Result;
-use binder::{ExceptionCode, Result as BinderResult, Status as BinderStatus, StatusCode};
+use binder::{
+    public_api::Result as BinderResult, ExceptionCode, Status as BinderStatus, StatusCode,
+};
 use keystore2_selinux as selinux;
 use std::ffi::CString;
 

diced/src/error_vendor.rs

diff --git a/diced/src/error_vendor.rs b/diced/src/error_vendor.rs
index e8657e0..10d50dd 100644
--- a/diced/src/error_vendor.rs
+++ b/diced/src/error_vendor.rs
@@ -14,7 +14,9 @@
 
 use android_hardware_security_dice::aidl::android::hardware::security::dice::ResponseCode::ResponseCode;
 use anyhow::Result;
-use binder::{ExceptionCode, Result as BinderResult, Status as BinderStatus, StatusCode};
+use binder::public_api::{
+    ExceptionCode, Result as BinderResult, Status as BinderStatus, StatusCode,
+};
 use std::ffi::CString;
 
 /// This is the error type for DICE HAL implementations. It wraps

diced/src/hal_node.rs

diff --git a/diced/src/hal_node.rs b/diced/src/hal_node.rs
index 6bc9c4a..fd5384f 100644
--- a/diced/src/hal_node.rs
+++ b/diced/src/hal_node.rs
@@ -33,7 +33,7 @@
     InputValues::InputValues as BinderInputValues, Signature::Signature,
 };
 use anyhow::{Context, Result};
-use binder::{BinderFeatures, Result as BinderResult, Strong};
+use binder::public_api::{BinderFeatures, Result as BinderResult, Strong};
 use dice::{ContextImpl, OpenDiceCborContext};
 use diced_open_dice_cbor as dice;
 use diced_utils as utils;

diced/src/lib.rs

diff --git a/diced/src/lib.rs b/diced/src/lib.rs
index 520f333..8562406 100644
--- a/diced/src/lib.rs
+++ b/diced/src/lib.rs
@@ -30,7 +30,7 @@
     IDiceNode::IDiceNode, ResponseCode::ResponseCode,
 };
 use anyhow::{Context, Result};
-use binder::{BinderFeatures, Result as BinderResult, Strong, ThreadState};
+use binder::{public_api::Result as BinderResult, BinderFeatures, Strong, ThreadState};
 pub use diced_open_dice_cbor as dice;
 use error::{map_or_log_err, Error};
 use keystore2_selinux as selinux;

diced/src/proxy_node_hal.rs

diff --git a/diced/src/proxy_node_hal.rs b/diced/src/proxy_node_hal.rs
index 8d883d2..3f31419 100644
--- a/diced/src/proxy_node_hal.rs
+++ b/diced/src/proxy_node_hal.rs
@@ -23,7 +23,7 @@
     InputValues::InputValues as BinderInputValues, Signature::Signature,
 };
 use anyhow::{Context, Result};
-use binder::Strong;
+use binder::public_api::Strong;
 use std::collections::HashMap;
 use std::sync::RwLock;