aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2022-12-22 00:35:57 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-12-22 00:35:57 +0000
commitbb1233c5f22658b9cac5a78678fb11a5198e2afc (patch)
treebd4167803f3c9ccdde57ee9f62a2e6ffe96277e5
parent264ccdf47839192345e8705910a4f98863694410 (diff)
parent1f13a6a60af808dccdd881a22af711d85c2e6a7f (diff)
downloadcxx-bb1233c5f22658b9cac5a78678fb11a5198e2afc.tar.gz
Merge "Allow vendor code to use cxx bindings" am: ca63e7cae0 am: 7309bcccc3 am: 1f13a6a60a
Original change: https://android-review.googlesource.com/c/platform/external/rust/cxx/+/2366028 Change-Id: I29c523265ea2376af61809e24386417a35ab5701 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",