aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2022-12-21 21:53:08 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-12-21 21:53:08 +0000
commit7309bcccc3fc9620f18c881161397f3fc3d336eb (patch)
treebd4167803f3c9ccdde57ee9f62a2e6ffe96277e5
parent827380624f33d185bceed22a1e43800e88617fb7 (diff)
parentca63e7cae06b587e72ad1c31151ad5d3f4f98d14 (diff)
downloadcxx-7309bcccc3fc9620f18c881161397f3fc3d336eb.tar.gz
Merge "Allow vendor code to use cxx bindings" am: ca63e7cae0
Original change: https://android-review.googlesource.com/c/platform/external/rust/cxx/+/2366028 Change-Id: I6760c236e9fce958288e9ae80e7cd89279dc7bda Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp4
1 files changed, 3 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 2504c397..04cfc9de 100644
--- a/Android.bp
+++ b/Android.bp
@@ -51,6 +51,7 @@ rust_library {
],
shared_libs: ["libc++"],
host_supported: true,
+ vendor_available: true,
apex_available: [
"//apex_available:platform",
"com.android.btservices",
@@ -61,11 +62,12 @@ rust_library {
}
cc_library_static {
- host_supported: true,
name: "libcxxbridge05",
defaults: ["rust_static_cc_lib_defaults"],
cflags: ["-DRUST_CXX_NO_EXCEPTIONS"],
srcs: ["src/cxx.cc"],
+ host_supported: true,
+ vendor_available: true,
apex_available: [
"//apex_available:platform",
"com.android.btservices",