aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElisei Zamakhov <elisei@google.com>2023-04-24 21:07:18 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-04-24 21:07:18 +0000
commit855027a685bb7d6e0f5dcead8a72b71216fb91dc (patch)
tree496f971c0abe318adfe0588a4b8e04eb9f5b6a43
parentc2d558aa13d0bd2ebaa63fe125d10a697bf307ae (diff)
parentfd4059222df1a3dc22c59d66e15095b9c87f3db4 (diff)
downloadregex-855027a685bb7d6e0f5dcead8a72b71216fb91dc.tar.gz
Make regex any apex avaliable am: 268d890f66 am: 647e77a373 am: fd4059222d
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/regex/+/2553978 Change-Id: Id051f6d4452577e848206426c0b3a3b66b1404ab 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
}