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

Commit c3f8e8a9 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11180250 from 907e5e0d to 24Q1-release

Change-Id: Id9b07d7db4be6552a154da23cdb53bdaa3be5d2c
parents 33e18a4c 907e5e0d
Loading
Loading
Loading
Loading
+0 −5
Original line number Diff line number Diff line
@@ -579,11 +579,6 @@ cc_library {
    ],
}

filegroup {
    name: "libbinder_rpc_unstable_header",
    srcs: ["include_rpc_unstable/binder_rpc_unstable.hpp"],
}

// libbinder historically contained additional interfaces that provided specific
// functionality in the platform but have nothing to do with binder itself. These
// are moved out of libbinder in order to avoid the overhead of their vtables.
+15 −2
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@
#include <cutils/trace.h>
#include <utils/misc.h>

namespace android::binder::os {
namespace android::binder {
namespace os {

uint64_t GetThreadId() {
#ifdef BINDER_RPC_SINGLE_THREADED
@@ -43,4 +44,16 @@ void trace_end(uint64_t tag) {
    atrace_end(tag);
}

} // namespace android::binder::os
} // namespace os

// Legacy trace symbol. To be removed once all of downstream rebuilds.
void atrace_begin(uint64_t tag, const char* name) {
    os::trace_begin(tag, name);
}

// Legacy trace symbol. To be removed once all of downstream rebuilds.
void atrace_end(uint64_t tag) {
    os::trace_end(tag);
}

} // namespace android::binder
+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ rust_library {
// TODO(b/184872979): remove once the RPC Binder API is stabilised.
rust_bindgen {
    name: "libbinder_rpc_unstable_bindgen",
    wrapper_src: ":libbinder_rpc_unstable_header",
    wrapper_src: "BinderBindings.hpp",
    crate_name: "binder_rpc_unstable_bindgen",
    visibility: [":__subpackages__"],
    source_stem: "bindings",
+1 −0
Original line number Diff line number Diff line
#include <binder_rpc_unstable.hpp>
+1 −1
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ use std::fmt;
use std::io::Write;
use std::marker::PhantomData;
use std::ops::Deref;
use std::os::fd::AsRawFd;
use std::os::raw::c_char;
use std::os::unix::io::AsRawFd;
use std::ptr;

/// Binder action to perform.
Loading