summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libs/binder/Android.bp6
-rw-r--r--libs/binder/include_rpc_unstable/binder_rpc_unstable.hpp (renamed from libs/binder/rust/src/binder_rpc_unstable.hpp)0
-rw-r--r--libs/binder/rust/Android.bp2
3 files changed, 7 insertions, 1 deletions
diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index 572d948509..fccc9fa68a 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -329,6 +329,7 @@ cc_library {
"libbinder_ndk",
"libutils",
],
+ export_include_dirs: ["include_rpc_unstable"],
// enumerate stable entry points, for apex use
stubs: {
@@ -342,6 +343,11 @@ 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/src/binder_rpc_unstable.hpp b/libs/binder/include_rpc_unstable/binder_rpc_unstable.hpp
index 7932d0f29c..7932d0f29c 100644
--- a/libs/binder/rust/src/binder_rpc_unstable.hpp
+++ b/libs/binder/include_rpc_unstable/binder_rpc_unstable.hpp
diff --git a/libs/binder/rust/Android.bp b/libs/binder/rust/Android.bp
index fe2da18b0d..d9d7cafa7c 100644
--- a/libs/binder/rust/Android.bp
+++ b/libs/binder/rust/Android.bp
@@ -109,7 +109,7 @@ rust_bindgen {
// TODO(b/184872979): remove once the Rust API is created.
rust_bindgen {
name: "libbinder_rpc_unstable_bindgen",
- wrapper_src: "src/binder_rpc_unstable.hpp",
+ wrapper_src: ":libbinder_rpc_unstable_header",
crate_name: "binder_rpc_unstable_bindgen",
source_stem: "bindings",
shared_libs: [