Merge "Hard-code apex_available handling for the btservices apex" into tm-dev am: 3bb9d7a8d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18972588 Change-Id: I5c6cc4bc32174ba0739d7ed6b42ae0b1685c4ef6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
committed by
Automerger Merge Worker
commit
7d7bc5bef1
@@ -454,6 +454,7 @@ 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)) ||
|
||||
(strings.HasPrefix(what, "com.android.gki.") && InList(AvailableToGkiApex, apex_available))
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user