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

Commit 6b49dcea authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "rpcbinder: Build on Trusty" into main am: 9285f28e 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2585152



Change-Id: Ie8038d10b194f64cc05a398e1b512c78a78f5c63
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 066748ef 9285f28e

libs/binder/rust/rpcbinder/src/lib.rs

+2 −0
Original line number Diff line number Diff line
@@ -16,8 +16,10 @@ 


//! API for RPC Binder services.



#[cfg(not(target_os = "trusty"))]

mod server;

mod session;



#[cfg(not(target_os = "trusty"))]

pub use server::{RpcServer, RpcServerRef};

pub use session::{FileDescriptorTransportMode, RpcSession, RpcSessionRef};

libs/binder/rust/rpcbinder/src/session.rs

+26 −8
Original line number Diff line number Diff line
@@ -17,11 +17,8 @@ 
use binder::unstable_api::new_spibinder;

use binder::{FromIBinder, SpIBinder, StatusCode, Strong};

use foreign_types::{foreign_type, ForeignType, ForeignTypeRef};

use std::ffi::CString;

use std::os::{

    raw::{c_int, c_void},

    unix::io::{AsRawFd, BorrowedFd, RawFd},

};

use std::os::fd::RawFd;

use std::os::raw::{c_int, c_void};



pub use binder_rpc_unstable_bindgen::ARpcSession_FileDescriptorTransportMode as FileDescriptorTransportMode;
@@ -87,6 +84,7 @@ impl RpcSessionRef { 
    }



    /// Connects to an RPC Binder server over vsock for a particular interface.

    #[cfg(not(target_os = "trusty"))]

    pub fn setup_vsock_client<T: FromIBinder + ?Sized>(

        &self,

        cid: u32,
@@ -106,11 +104,12 @@ impl RpcSessionRef { 


    /// Connects to an RPC Binder server over a names Unix Domain Socket for

    /// a particular interface.

    #[cfg(not(target_os = "trusty"))]

    pub fn setup_unix_domain_client<T: FromIBinder + ?Sized>(

        &self,

        socket_name: &str,

    ) -> Result<Strong<T>, StatusCode> {

        let socket_name = match CString::new(socket_name) {

        let socket_name = match std::ffi::CString::new(socket_name) {

            Ok(s) => s,

            Err(e) => {

                log::error!("Cannot convert {} to CString. Error: {:?}", socket_name, e);
@@ -131,10 +130,12 @@ impl RpcSessionRef { 


    /// Connects to an RPC Binder server over a bootstrap Unix Domain Socket

    /// for a particular interface.

    #[cfg(not(target_os = "trusty"))]

    pub fn setup_unix_domain_bootstrap_client<T: FromIBinder + ?Sized>(

        &self,

        bootstrap_fd: BorrowedFd,

        bootstrap_fd: std::os::fd::BorrowedFd,

    ) -> Result<Strong<T>, StatusCode> {

        use std::os::fd::AsRawFd;

        // SAFETY: ARpcSession_setupUnixDomainBootstrapClient does not take

        // ownership of bootstrap_fd. The returned AIBinder has correct

        // reference count, and the ownership can safely be taken by new_spibinder.
@@ -148,12 +149,13 @@ impl RpcSessionRef { 
    }



    /// Connects to an RPC Binder server over inet socket at the given address and port.

    #[cfg(not(target_os = "trusty"))]

    pub fn setup_inet_client<T: FromIBinder + ?Sized>(

        &self,

        address: &str,

        port: u32,

    ) -> Result<Strong<T>, StatusCode> {

        let address = match CString::new(address) {

        let address = match std::ffi::CString::new(address) {

            Ok(s) => s,

            Err(e) => {

                log::error!("Cannot convert {} to CString. Error: {:?}", address, e);
@@ -173,6 +175,22 @@ impl RpcSessionRef { 
        Self::get_interface(service)

    }



    #[cfg(target_os = "trusty")]

    pub fn setup_trusty_client<T: FromIBinder + ?Sized>(

        &self,

        port: &std::ffi::CStr,

    ) -> Result<Strong<T>, StatusCode> {

        self.setup_preconnected_client(|| {

            let h = tipc::Handle::connect(port)

                .expect("Failed to connect to service port {SERVICE_PORT}");



            // Do not close the handle at the end of the scope

            let fd = h.as_raw_fd();

            core::mem::forget(h);

            Some(fd)

        })

    }



    /// Connects to an RPC Binder server, using the given callback to get (and

    /// take ownership of) file descriptors already connected to it.

    pub fn setup_preconnected_client<T: FromIBinder + ?Sized>(

libs/binder/trusty/rust/rpcbinder/rules.mk

0 → 100644
+35 −0
Original line number Diff line number Diff line 
# 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 := $(LIBBINDER_DIR)/rust/rpcbinder/src/lib.rs



MODULE_CRATE_NAME := rpcbinder



MODULE_LIBRARY_DEPS += \

	$(LIBBINDER_DIR)/trusty \

	$(LIBBINDER_DIR)/trusty/ndk \

	$(LIBBINDER_DIR)/trusty/rust \

	$(LIBBINDER_DIR)/trusty/rust/binder_ndk_sys \

	$(LIBBINDER_DIR)/trusty/rust/binder_rpc_unstable_bindgen \

	external/rust/crates/foreign-types \

	trusty/user/base/lib/tipc/rust \

	trusty/user/base/lib/trusty-sys \



include make/library.mk