Merge "Remove obsolete com.android.bluetooth apex"
This commit is contained in:
commit
2eade656df
2 changed files with 0 additions and 32 deletions
|
@ -454,8 +454,6 @@ 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)) || // 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))
|
||||
}
|
||||
|
||||
|
|
30
apex/apex.go
30
apex/apex.go
|
@ -3054,36 +3054,6 @@ func makeApexAvailableBaseline() map[string][]string {
|
|||
//
|
||||
// Module separator
|
||||
//
|
||||
m["com.android.bluetooth"] = []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.cellbroadcast"] = []string{"CellBroadcastApp", "CellBroadcastServiceModule"}
|
||||
//
|
||||
// Module separator
|
||||
|
|
Loading…
Reference in a new issue