Move libadbd_auth, libadbd_fs to adbd_system_binaries.

The required block inside the definition of "adbd" does nothing: we get
the libraries it contains via direct dependency when building from
source, and not at all when using a prebuilt. Move them to a phony
rule that's explicitly listed in PRODUCT_PACKAGES.

Bug: http://b/157709367
Test: treehugger
Change-Id: I97c0889558482cfbe18ae91b39b6889d3fee877c
This commit is contained in:
Josh Gao 2020-06-01 18:59:21 -07:00
parent 510d2437b4
commit e572f2fc44

View file

@ -636,16 +636,14 @@ cc_binary {
],
}
},
required: [
"libadbd_auth",
"libadbd_fs",
],
}
phony {
name: "adbd_system_binaries",
// Interface between adbd in a module and the system.
name: "adbd_system_api",
required: [
"libadbd_auth",
"libadbd_fs",
"abb",
"reboot",
"set-verity-state",
@ -653,8 +651,10 @@ phony {
}
phony {
name: "adbd_system_binaries_recovery",
name: "adbd_system_api_recovery",
required: [
"libadbd_auth",
"libadbd_fs",
"reboot.recovery",
],
}