aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2022-10-11 13:36:42 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-10-11 13:36:42 +0000
commitae346060302371360b25a1b53172b008194bc39c (patch)
tree03277eb5a43dd336ae02e143dcf054df294088e5
parent9fea4b99005dd5a61054b3aba9a75c9d772d583f (diff)
parent105f42e9c634e31f14d522d116e128008d8d3c63 (diff)
downloadpin-utils-ae346060302371360b25a1b53172b008194bc39c.tar.gz
Remove explicit APEX list from build rules. am: 105f42e9c6main-16k-with-phones
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/pin-utils/+/2243094 Change-Id: I080363971c92b6168d40ee6a0bba5e28f74ee1b5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp4
-rw-r--r--cargo2android.json6
2 files changed, 1 insertions, 9 deletions
diff --git a/Android.bp b/Android.bp
index fc10bf7..bc36354 100644
--- a/Android.bp
+++ b/Android.bp
@@ -47,9 +47,7 @@ rust_library {
edition: "2018",
apex_available: [
"//apex_available:platform",
- "com.android.btservices",
- "com.android.resolv",
- "com.android.virt",
+ "//apex_available:anyapex",
],
vendor_available: true,
min_sdk_version: "29",
diff --git a/cargo2android.json b/cargo2android.json
index 5bfd3ae..e9ed115 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,10 +1,4 @@
{
- "apex-available": [
- "//apex_available:platform",
- "com.android.btservices",
- "com.android.resolv",
- "com.android.virt"
- ],
"dependencies": true,
"device": true,
"min-sdk-version": "29",