From 8a008ec87231958fafaeaee1691ab95e3f980079 Mon Sep 17 00:00:00 2001 From: Steven Ray Date: Fri, 8 Dec 2023 17:48:30 +0000 Subject: Rust binder rpc test & service implementation for trusty Test: Manually run trusty boot-test "com.android.trusty.rust.binder_rpc_test.test" Change-Id: Iee3bdf9bad6b3920ba67f8677a467d6c49d14e98 --- .../binder_rpc_test/binder_rpc_test_session/lib.rs | 174 ++++++++++++++++++ .../binder_rpc_test_session/rules.mk | 32 ++++ libs/binder/trusty/rust/binder_rpc_test/main.rs | 194 +++++++++++++++++++-- .../trusty/rust/binder_rpc_test/manifest.json | 2 +- libs/binder/trusty/rust/binder_rpc_test/rules.mk | 2 + .../trusty/rust/binder_rpc_test/service/main.rs | 131 +++++++++++--- .../trusty/rust/binder_rpc_test/service/rules.mk | 3 + libs/binder/trusty/rust/rules.mk | 1 + 8 files changed, 500 insertions(+), 39 deletions(-) create mode 100644 libs/binder/trusty/rust/binder_rpc_test/binder_rpc_test_session/lib.rs create mode 100644 libs/binder/trusty/rust/binder_rpc_test/binder_rpc_test_session/rules.mk diff --git a/libs/binder/trusty/rust/binder_rpc_test/binder_rpc_test_session/lib.rs b/libs/binder/trusty/rust/binder_rpc_test/binder_rpc_test_session/lib.rs new file mode 100644 index 0000000000..22cba44975 --- /dev/null +++ b/libs/binder/trusty/rust/binder_rpc_test/binder_rpc_test_session/lib.rs @@ -0,0 +1,174 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +use binder::{Interface, ParcelFileDescriptor, SpIBinder, Status, StatusCode, Strong}; +use binder_rpc_test_aidl::aidl::IBinderRpcCallback::IBinderRpcCallback; +use binder_rpc_test_aidl::aidl::IBinderRpcSession::IBinderRpcSession; +use binder_rpc_test_aidl::aidl::IBinderRpcTest::IBinderRpcTest; +use std::sync::Mutex; + +static G_NUM: Mutex = Mutex::new(0); + +#[derive(Debug, Default)] +pub struct MyBinderRpcSession { + name: String, +} + +impl MyBinderRpcSession { + pub fn new(name: &str) -> Self { + Self::increment_instance_count(); + Self { name: name.to_string() } + } + + pub fn get_instance_count() -> i32 { + *G_NUM.lock().unwrap() + } + + fn increment_instance_count() { + *G_NUM.lock().unwrap() += 1; + } + + fn decrement_instance_count() { + *G_NUM.lock().unwrap() -= 1; + } +} + +impl Drop for MyBinderRpcSession { + fn drop(&mut self) { + MyBinderRpcSession::decrement_instance_count(); + } +} + +impl Interface for MyBinderRpcSession {} + +impl IBinderRpcSession for MyBinderRpcSession { + fn getName(&self) -> Result { + Ok(self.name.clone()) + } +} + +impl IBinderRpcTest for MyBinderRpcSession { + fn sendString(&self, _: &str) -> Result<(), Status> { + todo!() + } + fn doubleString(&self, _s: &str) -> Result { + todo!() + } + fn getClientPort(&self) -> Result { + todo!() + } + fn countBinders(&self) -> Result, Status> { + todo!() + } + fn getNullBinder(&self) -> Result { + todo!() + } + fn pingMe(&self, _binder: &SpIBinder) -> Result { + todo!() + } + fn repeatBinder(&self, _binder: Option<&SpIBinder>) -> Result, Status> { + todo!() + } + fn holdBinder(&self, _binder: Option<&SpIBinder>) -> Result<(), Status> { + todo!() + } + fn getHeldBinder(&self) -> Result, Status> { + todo!() + } + fn nestMe( + &self, + binder: &Strong<(dyn IBinderRpcTest + 'static)>, + count: i32, + ) -> Result<(), Status> { + if count < 0 { + Ok(()) + } else { + binder.nestMe(binder, count - 1) + } + } + fn alwaysGiveMeTheSameBinder(&self) -> Result { + todo!() + } + fn openSession( + &self, + _name: &str, + ) -> Result, Status> { + todo!() + } + fn getNumOpenSessions(&self) -> Result { + todo!() + } + fn lock(&self) -> Result<(), Status> { + todo!() + } + fn unlockInMsAsync(&self, _: i32) -> Result<(), Status> { + todo!() + } + fn lockUnlock(&self) -> Result<(), Status> { + todo!() + } + fn sleepMs(&self, _: i32) -> Result<(), Status> { + todo!() + } + fn sleepMsAsync(&self, _: i32) -> Result<(), Status> { + todo!() + } + fn doCallback( + &self, + _: &Strong<(dyn IBinderRpcCallback + 'static)>, + _: bool, + _: bool, + _: &str, + ) -> Result<(), Status> { + todo!() + } + fn doCallbackAsync( + &self, + _: &Strong<(dyn IBinderRpcCallback + 'static)>, + _: bool, + _: bool, + _: &str, + ) -> Result<(), Status> { + todo!() + } + fn die(&self, _: bool) -> Result<(), Status> { + Err(Status::from(StatusCode::UNKNOWN_TRANSACTION)) + } + fn scheduleShutdown(&self) -> Result<(), Status> { + todo!() + } + fn useKernelBinderCallingId(&self) -> Result<(), Status> { + todo!() + } + fn echoAsFile(&self, _: &str) -> Result { + todo!() + } + fn concatFiles(&self, _: &[ParcelFileDescriptor]) -> Result { + todo!() + } + fn blockingSendFdOneway(&self, _: &ParcelFileDescriptor) -> Result<(), Status> { + todo!() + } + fn blockingRecvFd(&self) -> Result { + todo!() + } + fn blockingSendIntOneway(&self, _: i32) -> Result<(), Status> { + todo!() + } + fn blockingRecvInt(&self) -> Result { + todo!() + } +} diff --git a/libs/binder/trusty/rust/binder_rpc_test/binder_rpc_test_session/rules.mk b/libs/binder/trusty/rust/binder_rpc_test/binder_rpc_test_session/rules.mk new file mode 100644 index 0000000000..ae26355521 --- /dev/null +++ b/libs/binder/trusty/rust/binder_rpc_test/binder_rpc_test_session/rules.mk @@ -0,0 +1,32 @@ +# Copyright (C) 2023 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +LOCAL_DIR := $(GET_LOCAL_DIR) +LIBBINDER_DIR := $(LOCAL_DIR)/../../../.. + +MODULE := $(LOCAL_DIR) + +MODULE_SRCS := $(LOCAL_DIR)/lib.rs + +MODULE_CRATE_NAME := binder_rpc_test_session + +MODULE_LIBRARY_DEPS += \ + $(LIBBINDER_DIR)/trusty/rust \ + $(LIBBINDER_DIR)/trusty/rust/rpcbinder \ + $(LOCAL_DIR)/../aidl \ + $(call FIND_CRATE,log) \ + trusty/user/base/lib/trusty-std \ + +include make/library.mk diff --git a/libs/binder/trusty/rust/binder_rpc_test/main.rs b/libs/binder/trusty/rust/binder_rpc_test/main.rs index 3c1e784418..baea5a827b 100644 --- a/libs/binder/trusty/rust/binder_rpc_test/main.rs +++ b/libs/binder/trusty/rust/binder_rpc_test/main.rs @@ -15,8 +15,11 @@ */ #![cfg(test)] -use binder::{IBinder, Strong}; -use binder_rpc_test_aidl::aidl::IBinderRpcTest::IBinderRpcTest; +use binder::{BinderFeatures, IBinder, Status, StatusCode, Strong}; +use binder_rpc_test_aidl::aidl::IBinderRpcSession::{BnBinderRpcSession, IBinderRpcSession}; +use binder_rpc_test_aidl::aidl::IBinderRpcTest::{BnBinderRpcTest, IBinderRpcTest}; +use binder_rpc_test_session::MyBinderRpcSession; +use libc::{clock_gettime, CLOCK_REALTIME}; use rpcbinder::RpcSession; use trusty_std::ffi::{CString, FallibleCString}; @@ -25,19 +28,190 @@ test::init!(); const SERVICE_PORT: &str = "com.android.trusty.binderRpcTestService.V1"; const RUST_SERVICE_PORT: &str = "com.android.trusty.rust.binderRpcTestService.V1"; +macro_rules! service_test { + ($c_name:ident, $rust_name:ident, $body:expr) => { + #[test] + fn $c_name() { + $body(get_service(SERVICE_PORT)) + } + #[test] + fn $rust_name() { + $body(get_service(RUST_SERVICE_PORT)) + } + }; +} + fn get_service(port: &str) -> Strong { let port = CString::try_new(port).expect("Failed to allocate port name"); RpcSession::new().setup_trusty_client(port.as_c_str()).expect("Failed to create session") } -#[test] -fn ping() { - let srv = get_service(SERVICE_PORT); - assert_eq!(srv.as_binder().ping_binder(), Ok(())); +fn expect_sessions(expected: i32, srv: &Strong) { + let count = srv.getNumOpenSessions(); + assert!(count.is_ok()); + assert_eq!(expected, count.unwrap()); } -#[test] -fn ping_rust() { - let srv = get_service(RUST_SERVICE_PORT); - assert_eq!(srv.as_binder().ping_binder(), Ok(())); +fn get_time_ns() -> u64 { + let mut ts = libc::timespec { tv_sec: 0, tv_nsec: 0 }; + + // Safety: Passing valid pointer to variable ts which lives past end of call + assert_eq!(unsafe { clock_gettime(CLOCK_REALTIME, &mut ts) }, 0); + + ts.tv_sec as u64 * 1_000_000_000u64 + ts.tv_nsec as u64 } + +fn get_time_ms() -> u64 { + get_time_ns() / 1_000_000u64 +} + +// ---------- + +service_test! {ping, ping_rust, |srv: Strong| { + assert_eq!(srv.as_binder().ping_binder(), Ok(())); +}} + +service_test! {send_something_oneway, send_something_oneway_rust, |srv: Strong| { + assert_eq!(srv.sendString("Foo"), Ok(())); +}} + +service_test! {send_and_get_result_back, send_and_get_result_back_rust, |srv: Strong| { + assert_eq!(srv.doubleString("Foo"), Ok(String::from("FooFoo"))); +}} + +service_test! {send_and_get_result_back_big, send_and_get_result_back_big_rust, |srv: Strong| { + let single_len = 512; + let single = "a".repeat(single_len); + assert_eq!(srv.doubleString(&single), Ok(String::from(single.clone() + &single))); +}} + +service_test! {invalid_null_binder_return, invalid_null_binder_return_rust, |srv: Strong| { + let binder = srv.getNullBinder(); + assert!(binder == Err(Status::from(StatusCode::UNEXPECTED_NULL)) || binder == Err(Status::from(StatusCode::UNKNOWN_TRANSACTION))); +}} + +service_test! {call_me_back, call_me_back_rust, |srv: Strong| { + let binder = + BnBinderRpcSession::new_binder(MyBinderRpcSession::new("Foo"), BinderFeatures::default()) + .as_binder(); + let result = srv.pingMe(&binder); + assert_eq!(result, Ok(0)); +}} + +service_test! {repeat_binder, repeat_binder_rust, |srv: Strong| { + let in_binder = + BnBinderRpcSession::new_binder(MyBinderRpcSession::new("Foo"), BinderFeatures::default()) + .as_binder(); + let result = srv.repeatBinder(Some(&in_binder)); + assert_eq!(result.unwrap().unwrap(), in_binder); +}} + +service_test! {repeat_their_binder, repeat_their_binder_rust, |srv: Strong| { + let session = srv.openSession("Test"); + assert!(session.is_ok()); + + let in_binder = session.unwrap().as_binder(); + let out_binder = srv.repeatBinder(Some(&in_binder)); + assert_eq!(out_binder.unwrap().unwrap(), in_binder); +}} + +service_test! {hold_binder, hold_binder_rust, |srv: Strong| { + let name = "Foo"; + + let binder = + BnBinderRpcSession::new_binder(MyBinderRpcSession::new(name), BinderFeatures::default()) + .as_binder(); + assert!(srv.holdBinder(Some(&binder)).is_ok()); + + let held = srv.getHeldBinder(); + assert!(held.is_ok()); + let held = held.unwrap(); + assert!(held.is_some()); + let held = held.unwrap(); + assert_eq!(binder, held); + + let session = held.into_interface::(); + assert!(session.is_ok()); + + let session_name = session.unwrap().getName(); + assert!(session_name.is_ok()); + let session_name = session_name.unwrap(); + assert_eq!(session_name, name); + + assert!(srv.holdBinder(None).is_ok()); +}} + +service_test! {nested_transactions, nested_transactions_rust, |srv: Strong| { + let binder = + BnBinderRpcTest::new_binder(MyBinderRpcSession::new("Nest"), BinderFeatures::default()); + assert!(srv.nestMe(&binder, 10).is_ok()); +}} + +service_test! {same_binder_equality, same_binder_equality_rust, |srv: Strong| { + let a = srv.alwaysGiveMeTheSameBinder(); + assert!(a.is_ok()); + + let b = srv.alwaysGiveMeTheSameBinder(); + assert!(b.is_ok()); + + assert_eq!(a.unwrap(), b.unwrap()); +}} + +service_test! {single_session, single_session_rust, |srv: Strong| { + let session = srv.openSession("aoeu"); + assert!(session.is_ok()); + let session = session.unwrap(); + let name = session.getName(); + assert!(name.is_ok()); + assert_eq!(name.unwrap(), "aoeu"); + + let count = srv.getNumOpenSessions(); + assert!(count.is_ok()); + assert_eq!(count.unwrap(), 1); + + drop(session); + let count = srv.getNumOpenSessions(); + assert!(count.is_ok()); + assert_eq!(count.unwrap(), 0); +}} + +service_test! {many_session, many_session_rust, |srv: Strong| { + let mut sessions = Vec::new(); + + for i in 0..15 { + expect_sessions(i, &srv); + + let session = srv.openSession(&(i.to_string())); + assert!(session.is_ok()); + sessions.push(session.unwrap()); + } + + expect_sessions(sessions.len() as i32, &srv); + + for i in 0..sessions.len() { + let name = sessions[i].getName(); + assert!(name.is_ok()); + assert_eq!(name.unwrap(), i.to_string()); + } + + expect_sessions(sessions.len() as i32, &srv); + + while !sessions.is_empty() { + sessions.pop(); + + expect_sessions(sessions.len() as i32, &srv); + } + + expect_sessions(0, &srv); +}} + +service_test! {one_way_call_does_not_wait, one_way_call_does_not_wait_rust, |srv: Strong| { + let really_long_time_ms = 100; + let sleep_ms = really_long_time_ms * 5; + + let before = get_time_ms(); + let _ = srv.sleepMsAsync(sleep_ms); + let after = get_time_ms(); + + assert!(after < before + really_long_time_ms as u64); +}} diff --git a/libs/binder/trusty/rust/binder_rpc_test/manifest.json b/libs/binder/trusty/rust/binder_rpc_test/manifest.json index c2ecaa4fe3..384ed441c6 100644 --- a/libs/binder/trusty/rust/binder_rpc_test/manifest.json +++ b/libs/binder/trusty/rust/binder_rpc_test/manifest.json @@ -1,7 +1,7 @@ { "uuid": "91eed949-8a9e-4569-9c83-5935fb624025", "app_name": "rust_binder_rpc_test", - "min_heap": 16384, + "min_heap": 32768, "min_stack": 16384, "mgmt_flags": { "non_critical_app": true diff --git a/libs/binder/trusty/rust/binder_rpc_test/rules.mk b/libs/binder/trusty/rust/binder_rpc_test/rules.mk index 192a1591ae..8347a359db 100644 --- a/libs/binder/trusty/rust/binder_rpc_test/rules.mk +++ b/libs/binder/trusty/rust/binder_rpc_test/rules.mk @@ -26,6 +26,8 @@ MODULE_LIBRARY_DEPS += \ $(LIBBINDER_DIR)/trusty/rust \ $(LIBBINDER_DIR)/trusty/rust/rpcbinder \ $(LOCAL_DIR)/aidl \ + $(LOCAL_DIR)/binder_rpc_test_session \ + $(call FIND_CRATE,log) \ trusty/user/base/lib/trusty-std \ MODULE_RUST_TESTS := true diff --git a/libs/binder/trusty/rust/binder_rpc_test/service/main.rs b/libs/binder/trusty/rust/binder_rpc_test/service/main.rs index b9a86bf240..c4a758a214 100644 --- a/libs/binder/trusty/rust/binder_rpc_test/service/main.rs +++ b/libs/binder/trusty/rust/binder_rpc_test/service/main.rs @@ -13,61 +13,126 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -use binder::{BinderFeatures, Interface, ParcelFileDescriptor, SpIBinder, Status, Strong}; +use binder::{ + BinderFeatures, IBinder, Interface, ParcelFileDescriptor, SpIBinder, Status, StatusCode, Strong, +}; use binder_rpc_test_aidl::aidl::IBinderRpcCallback::IBinderRpcCallback; -use binder_rpc_test_aidl::aidl::IBinderRpcSession::IBinderRpcSession; +use binder_rpc_test_aidl::aidl::IBinderRpcSession::{BnBinderRpcSession, IBinderRpcSession}; use binder_rpc_test_aidl::aidl::IBinderRpcTest::{BnBinderRpcTest, IBinderRpcTest}; +use binder_rpc_test_session::MyBinderRpcSession; +use libc::{c_long, nanosleep, timespec}; use rpcbinder::RpcServer; use std::rc::Rc; +use std::sync::Mutex; use tipc::{service_dispatcher, wrap_service, Manager, PortCfg}; const RUST_SERVICE_PORT: &str = "com.android.trusty.rust.binderRpcTestService.V1"; +// ----------------------------------------------------------------------------- + +static SESSION_COUNT: Mutex = Mutex::new(0); +static HOLD_BINDER: Mutex> = Mutex::new(None); +static SAME_BINDER: Mutex> = Mutex::new(None); + #[derive(Debug, Default)] -struct TestService; +struct TestService { + port: i32, + name: String, +} + +#[allow(dead_code)] +impl TestService { + fn new(name: &str) -> Self { + *SESSION_COUNT.lock().unwrap() += 1; + Self { name: name.to_string(), ..Default::default() } + } + + fn get_instance_count() -> i32 { + *SESSION_COUNT.lock().unwrap() + } +} + +impl Drop for TestService { + fn drop(&mut self) { + *SESSION_COUNT.lock().unwrap() -= 1; + } +} impl Interface for TestService {} +impl IBinderRpcSession for TestService { + fn getName(&self) -> Result { + Ok(self.name.clone()) + } +} + impl IBinderRpcTest for TestService { fn sendString(&self, _: &str) -> Result<(), Status> { - todo!() + // This is a oneway function, so caller returned immediately and gives back an Ok(()) regardless of what this returns + Ok(()) } - fn doubleString(&self, _: &str) -> Result { - todo!() + fn doubleString(&self, s: &str) -> Result { + let ss = [s, s].concat(); + Ok(ss) } fn getClientPort(&self) -> Result { - todo!() + Ok(self.port) } fn countBinders(&self) -> Result, Status> { todo!() } fn getNullBinder(&self) -> Result { - todo!() + Err(Status::from(StatusCode::UNKNOWN_TRANSACTION)) } - fn pingMe(&self, _: &SpIBinder) -> Result { - todo!() + fn pingMe(&self, binder: &SpIBinder) -> Result { + match binder.clone().ping_binder() { + Ok(()) => Ok(StatusCode::OK as i32), + Err(e) => Err(Status::from(e)), + } } - fn repeatBinder(&self, _: Option<&SpIBinder>) -> Result, Status> { - todo!() + fn repeatBinder(&self, binder: Option<&SpIBinder>) -> Result, Status> { + match binder { + Some(x) => Ok(Some(x.clone())), + None => Err(Status::from(StatusCode::BAD_VALUE)), + } } - fn holdBinder(&self, _: Option<&SpIBinder>) -> Result<(), Status> { - todo!() + fn holdBinder(&self, binder: Option<&SpIBinder>) -> Result<(), Status> { + *HOLD_BINDER.lock().unwrap() = binder.cloned(); + Ok(()) } fn getHeldBinder(&self) -> Result, Status> { - todo!() + Ok((*HOLD_BINDER.lock().unwrap()).clone()) } - fn nestMe(&self, _: &Strong<(dyn IBinderRpcTest + 'static)>, _: i32) -> Result<(), Status> { - todo!() + fn nestMe( + &self, + binder: &Strong<(dyn IBinderRpcTest + 'static)>, + count: i32, + ) -> Result<(), Status> { + if count < 0 { + Ok(()) + } else { + binder.nestMe(binder, count - 1) + } } fn alwaysGiveMeTheSameBinder(&self) -> Result { - todo!() - } - fn openSession(&self, _: &str) -> Result, Status> { - todo!() + let mut locked = SAME_BINDER.lock().unwrap(); + Ok((*locked) + .get_or_insert_with(|| { + BnBinderRpcTest::new_binder(TestService::default(), BinderFeatures::default()) + .as_binder() + }) + .clone()) + } + fn openSession(&self, name: &str) -> Result, Status> { + let s = BnBinderRpcSession::new_binder( + MyBinderRpcSession::new(name), + BinderFeatures::default(), + ); + Ok(s) } fn getNumOpenSessions(&self) -> Result { - todo!() + let count = MyBinderRpcSession::get_instance_count(); + Ok(count) } fn lock(&self) -> Result<(), Status> { todo!() @@ -78,11 +143,21 @@ impl IBinderRpcTest for TestService { fn lockUnlock(&self) -> Result<(), Status> { todo!() } - fn sleepMs(&self, _: i32) -> Result<(), Status> { - todo!() + fn sleepMs(&self, ms: i32) -> Result<(), Status> { + let ts = timespec { + tv_sec: (ms / 1000) as c_long, + tv_nsec: (ms % 1000) as c_long * 1_000_000 as c_long, + }; + + let mut rem = timespec { tv_sec: 0, tv_nsec: 0 }; + + // Safety: Passing valid pointers to variables ts & rem which live past end of call + assert_eq!(unsafe { nanosleep(&ts, &mut rem) }, 0); + + Ok(()) } - fn sleepMsAsync(&self, _: i32) -> Result<(), Status> { - todo!() + fn sleepMsAsync(&self, ms: i32) -> Result<(), Status> { + self.sleepMs(ms) } fn doCallback( &self, @@ -103,7 +178,7 @@ impl IBinderRpcTest for TestService { todo!() } fn die(&self, _: bool) -> Result<(), Status> { - todo!() + Err(Status::from(StatusCode::UNKNOWN_TRANSACTION)) } fn scheduleShutdown(&self) -> Result<(), Status> { todo!() diff --git a/libs/binder/trusty/rust/binder_rpc_test/service/rules.mk b/libs/binder/trusty/rust/binder_rpc_test/service/rules.mk index 1ddc382197..f71ee9bcbd 100644 --- a/libs/binder/trusty/rust/binder_rpc_test/service/rules.mk +++ b/libs/binder/trusty/rust/binder_rpc_test/service/rules.mk @@ -25,7 +25,10 @@ MODULE_CRATE_NAME := binder_rpc_test_service MODULE_LIBRARY_DEPS += \ $(LIBBINDER_DIR)/trusty/rust \ $(LIBBINDER_DIR)/trusty/rust/rpcbinder \ + $(LIBBINDER_DIR)/trusty/rust/binder_rpc_server \ $(LOCAL_DIR)/../aidl \ + $(LOCAL_DIR)/../binder_rpc_test_session \ + $(LOCAL_DIR)/.. \ trusty/user/base/lib/tipc/rust \ MANIFEST := $(LOCAL_DIR)/manifest.json diff --git a/libs/binder/trusty/rust/rules.mk b/libs/binder/trusty/rust/rules.mk index c5e671a4f5..36bd3a2e75 100644 --- a/libs/binder/trusty/rust/rules.mk +++ b/libs/binder/trusty/rust/rules.mk @@ -28,6 +28,7 @@ MODULE_LIBRARY_DEPS += \ $(LIBBINDER_DIR)/trusty/rust/binder_ndk_sys \ $(LIBBINDER_DIR)/trusty/rust/binder_rpc_unstable_bindgen \ external/rust/crates/downcast-rs \ + external/rust/crates/libc \ trusty/user/base/lib/trusty-sys \ MODULE_RUSTFLAGS += \ -- cgit v1.2.3