From 72da93e188cff69b4be448dbe46419d27c213362 Mon Sep 17 00:00:00 2001 From: William Escande Date: Thu, 18 Aug 2022 13:34:22 -0700 Subject: [PATCH] Bluetooth available hack The first hack has been introduced to facilitate the creation of the com.android.btservices apex without the need to upload 100+ cl close to the release date. We now want to delete com.android.bluetooth apex and replace all the apex_available rules to target the new apex name It will be way much easier to do this in separate CL and without forcing us into a single topic. Bug: 243054261 Bug: 245214856 Test: Build Change-Id: Ia03698db839db4684871eb38c088f88d6bdcba4b (cherry picked from commit 2ad6e84d6062d8b16a348839e3d75f2065d41fa9) Merged-In: Ia03698db839db4684871eb38c088f88d6bdcba4b --- android/apex.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/android/apex.go b/android/apex.go index 20c78eece..98b122eae 100644 --- a/android/apex.go +++ b/android/apex.go @@ -454,7 +454,8 @@ func CheckAvailableForApex(what string, apex_available []string) bool { } return InList(what, apex_available) || (what != AvailableToPlatform && InList(AvailableToAnyApex, apex_available)) || - (what == "com.android.btservices" && InList("com.android.bluetooth", apex_available)) || + (what == "com.android.btservices" && InList("com.android.bluetooth", apex_available)) || // TODO b/243054261 + (what == "com.android.bluetooth" && InList("com.android.btservices", apex_available)) || // TODO b/243054261 (strings.HasPrefix(what, "com.android.gki.") && InList(AvailableToGkiApex, apex_available)) }