aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElisei Zamakhov <elisei@google.com>2023-04-24 20:20:20 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-04-24 20:20:20 +0000
commitfd4059222df1a3dc22c59d66e15095b9c87f3db4 (patch)
tree496f971c0abe318adfe0588a4b8e04eb9f5b6a43
parenta412b776b1169b4d3c3ab09a9122910a4e9d8226 (diff)
parent647e77a373bdbe992aace98ec4a96039b299d6de (diff)
downloadregex-fd4059222df1a3dc22c59d66e15095b9c87f3db4.tar.gz
Make regex any apex avaliable am: 268d890f66 am: 647e77a373
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/regex/+/2553978 Change-Id: I4cdaf4cc940d0c5e09b8c1378f3a9806f2c76a87 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp3
-rw-r--r--cargo2android.json6
2 files changed, 4 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp
index 5b27d25..b09a46d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -71,9 +71,8 @@ rust_library {
"libregex_syntax",
],
apex_available: [
+ "//apex_available:anyapex",
"//apex_available:platform",
- "com.android.compos",
- "com.android.virt",
],
product_available: true,
vendor_available: true,
diff --git a/cargo2android.json b/cargo2android.json
index bef74ca..c6170fd 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,12 +1,12 @@
{
"apex-available": [
- "//apex_available:platform",
- "com.android.compos",
- "com.android.virt"
+ "//apex_available:anyapex",
+ "//apex_available:platform"
],
"dependencies": true,
"device": true,
"run": true,
"tests": true,
+ "product-available": true,
"vendor-available": true
}