From 3fcebc5467064030043d785ed104ff328254ae2f Mon Sep 17 00:00:00 2001 From: Marcin Radomski Date: Mon, 17 Jul 2023 13:46:08 +0000 Subject: pin-project-lite crate: enable use in any apex Remove the apex-available override in cargo2android.json and regenerate the Android.bp file. This applies the default value of apex_available, which is to allow all APEXes to use the crate (as well as the tracing crate which depends on this one). Bug: 290588866 Test: presubmits Change-Id: I76cca1ee5b34388e445776e7b1b9a7a86391e57c --- Android.bp | 5 +---- cargo2android.json | 7 ------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/Android.bp b/Android.bp index 9f11a3d..f37c97e 100644 --- a/Android.bp +++ b/Android.bp @@ -49,10 +49,7 @@ rust_library { edition: "2018", apex_available: [ "//apex_available:platform", - "com.android.btservices", - "com.android.resolv", - "com.android.uwb", - "com.android.virt", + "//apex_available:anyapex", ], product_available: true, vendor_available: true, diff --git a/cargo2android.json b/cargo2android.json index 055645b..ef4e5f8 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,11 +1,4 @@ { - "apex-available": [ - "//apex_available:platform", - "com.android.btservices", - "com.android.resolv", - "com.android.uwb", - "com.android.virt" - ], "dependencies": true, "device": true, "min-sdk-version": "29", -- cgit v1.2.3