aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElisei Zamakhov <elisei@google.com>2023-04-24 22:31:24 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-04-24 22:31:24 +0000
commit3077e02b1b9dde66cd3312030dc35f31ebcbfba3 (patch)
tree496f971c0abe318adfe0588a4b8e04eb9f5b6a43
parentc02df26a9ec2207606a379a8b4c12f91b12b9e1d (diff)
parent2bd03a54b8a896755ebc8753e3608c4fbcd6f8c4 (diff)
downloadregex-3077e02b1b9dde66cd3312030dc35f31ebcbfba3.tar.gz
Make regex any apex avaliable am: 268d890f66 am: 647e77a373 am: fd4059222d am: 855027a685 am: 2bd03a54b8
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/regex/+/2553978 Change-Id: I457852ec273591c7b2a88bdfb5402d459b47b845 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
}