From 8132fbf8c1a8dedc72439b35126dc6cc15462dd4 Mon Sep 17 00:00:00 2001
From: Oriol Prieto Gasco <opg@google.com>
Date: Fri, 17 Jun 2022 19:44:25 +0000
Subject: [PATCH] Hard-code apex_available handling for the btservices apex

Bug: 236192423
Test: TH
Change-Id: Ie095ae22704a80e0ec171b1bb3fdc995f95a1c64
---
 android/apex.go |  1 +
 apex/apex.go    | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/android/apex.go b/android/apex.go
index 63cdaaf5e..20c78eece 100644
--- a/android/apex.go
+++ b/android/apex.go
@@ -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))
 }
 
diff --git a/apex/apex.go b/apex/apex.go
index 6e6174334..951157f17 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -2775,6 +2775,36 @@ func makeApexAvailableBaseline() map[string][]string {
 	//
 	// Module separator
 	//
+	m["com.android.btservices"] = []string{
+		"bluetooth-protos-lite",
+		"internal_include_headers",
+		"libaudio-a2dp-hw-utils",
+		"libaudio-hearing-aid-hw-utils",
+		"libbluetooth",
+		"libbluetooth-types",
+		"libbluetooth-types-header",
+		"libbluetooth_gd",
+		"libbluetooth_headers",
+		"libbluetooth_jni",
+		"libbt-audio-hal-interface",
+		"libbt-bta",
+		"libbt-common",
+		"libbt-hci",
+		"libbt-platform-protos-lite",
+		"libbt-protos-lite",
+		"libbt-sbc-decoder",
+		"libbt-sbc-encoder",
+		"libbt-stack",
+		"libbt-utils",
+		"libbtcore",
+		"libbtdevice",
+		"libbte",
+		"libbtif",
+		"libchrome",
+	}
+	//
+	// Module separator
+	//
 	m["com.android.bluetooth"] = []string{
 		"bluetooth-protos-lite",
 		"internal_include_headers",