summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-12-05 02:10:21 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2023-12-05 02:10:21 +0000
commit443973f505b34b2a8cc71ae18f9067e5c629719c (patch)
tree56fada6cc5332e82608d9c68ef3b759b578ebbc2
parent416b71f0b079f4f4be36daaa5b3d940266694f4d (diff)
parent5fca42a7d9664f3d9b8f232c96b11dcc27702457 (diff)
Merge "rust: Use wrapper for header file" into main
-rw-r--r--libs/binder/Android.bp5
-rw-r--r--libs/binder/rust/rpcbinder/Android.bp2
-rw-r--r--libs/binder/rust/rpcbinder/BinderBindings.hpp1
3 files changed, 2 insertions, 6 deletions
diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index d73c3a4e8c..11e81206d6 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -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.
diff --git a/libs/binder/rust/rpcbinder/Android.bp b/libs/binder/rust/rpcbinder/Android.bp
index 788abc4617..535ce010f7 100644
--- a/libs/binder/rust/rpcbinder/Android.bp
+++ b/libs/binder/rust/rpcbinder/Android.bp
@@ -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",
diff --git a/libs/binder/rust/rpcbinder/BinderBindings.hpp b/libs/binder/rust/rpcbinder/BinderBindings.hpp
new file mode 100644
index 0000000000..7feb9650fd
--- /dev/null
+++ b/libs/binder/rust/rpcbinder/BinderBindings.hpp
@@ -0,0 +1 @@
+#include <binder_rpc_unstable.hpp>