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 2ad6e84d60)
Merged-In: Ia03698db839db4684871eb38c088f88d6bdcba4b
This commit is contained in:
William Escande
2022-08-18 13:34:22 -07:00
parent cfd0caaf78
commit 72da93e188

View File

@@ -454,7 +454,8 @@ func CheckAvailableForApex(what string, apex_available []string) bool {
} }
return InList(what, apex_available) || return InList(what, apex_available) ||
(what != AvailableToPlatform && InList(AvailableToAnyApex, 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)) (strings.HasPrefix(what, "com.android.gki.") && InList(AvailableToGkiApex, apex_available))
} }