From 183b4575dd876694c13e2eb33f78c5ba1b6fa245 Mon Sep 17 00:00:00 2001 From: Seth Moore Date: Tue, 4 Oct 2022 17:13:00 -0700 Subject: Remove explicit apex list from build rules The default is to allow linking into any apex, so rely on that now instead of extending the list of explicit apexes in cargo2android Test: Build Change-Id: I533ba5faa62de120638c84b7b36c5e590e352b0f --- Android.bp | 6 +----- cargo2android.json | 8 -------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/Android.bp b/Android.bp index 1472c48..45bde32 100644 --- a/Android.bp +++ b/Android.bp @@ -193,11 +193,7 @@ rust_library { ], apex_available: [ "//apex_available:platform", - "com.android.btservices", - "com.android.compos", - "com.android.resolv", - "com.android.uwb", - "com.android.virt", + "//apex_available:anyapex", ], vendor_available: true, min_sdk_version: "29", diff --git a/cargo2android.json b/cargo2android.json index b50ec11..adb0d01 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,12 +1,4 @@ { - "apex-available": [ - "//apex_available:platform", - "com.android.btservices", - "com.android.compos", - "com.android.resolv", - "com.android.uwb", - "com.android.virt" - ], "dependencies": true, "dependency-blocklist": [ "rustversion", -- cgit v1.2.3