aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElisei Zamakhov <elisei@google.com>2023-04-24 19:12:42 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-04-24 19:12:42 +0000
commitc6f8d2d36face2fe89a949600f847db18012ba2b (patch)
tree5705a2abea3b6582ad473082baf7e855af1f5a47
parent988409603f420848784bf6b8454c0f059f9c9f00 (diff)
parente74cb65e0c5d2580ec0941e142f3096d8617f113 (diff)
downloadcxx-c6f8d2d36face2fe89a949600f847db18012ba2b.tar.gz
Allow using cxx in other apexes am: e74cb65e0c
Original change: https://android-review.googlesource.com/c/platform/external/rust/cxx/+/2554114 Change-Id: I8ad2173f1bd4ec691598d46e4d6f78d04c4f76fe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp13
1 files changed, 6 insertions, 7 deletions
diff --git a/Android.bp b/Android.bp
index 4c40b571..59e55618 100644
--- a/Android.bp
+++ b/Android.bp
@@ -58,10 +58,8 @@ rust_library {
vendor_available: true,
product_available: true,
apex_available: [
+ "//apex_available:anyapex",
"//apex_available:platform",
- "com.android.btservices",
- "com.android.compos",
- "com.android.virt",
],
min_sdk_version: "29",
}
@@ -75,10 +73,8 @@ cc_library_static {
vendor_available: true,
product_available: true,
apex_available: [
+ "//apex_available:anyapex",
"//apex_available:platform",
- "com.android.btservices",
- "com.android.compos",
- "com.android.virt",
],
min_sdk_version: "29",
}
@@ -87,7 +83,10 @@ cc_library_static {
host_supported: true,
name: "libcxx-demo-blobstore",
srcs: ["demo/src/blobstore.cc"],
- generated_headers: ["cxx-demo-bridge-header", "cxx-bridge-header"],
+ generated_headers: [
+ "cxx-demo-bridge-header",
+ "cxx-bridge-header",
+ ],
generated_sources: ["cxx-demo-bridge-code"],
}