Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8132fbf8 authored by Oriol Prieto Gasco's avatar Oriol Prieto Gasco Committed by Oriol Prieto Gascó
Browse files

Hard-code apex_available handling for the btservices apex 

Bug: 236192423
Test: TH
Change-Id: Ie095ae22704a80e0ec171b1bb3fdc995f95a1c64
parent 48991228

android/apex.go

+1 −0
Original line number Diff line number Diff line
@@ -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))

}

apex/apex.go

+30 −0
Original line number Diff line number Diff line
@@ -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",