minadbd: statically link libadbd.
Reduce the amount of wasted space on the recovery image by statically linking all of the adb libraries into minadbd. Bug: http://b/150317254 Test: booted aosp_walleye-eng into recovery Change-Id: I5233b1a23c14f9d478bb77c25ebdbb0ce45bcc5a Merged-In: I5233b1a23c14f9d478bb77c25ebdbb0ce45bcc5a (cherry picked from commit 5ee3eba34f0ddf478f53ac4d0774c1ee423a5182)
This commit is contained in:
+9
-3
@@ -34,7 +34,7 @@ cc_defaults {
|
|||||||
|
|
||||||
// `libminadbd_services` is analogous to the `libadbd_services` for regular `adbd`, but providing
|
// `libminadbd_services` is analogous to the `libadbd_services` for regular `adbd`, but providing
|
||||||
// the sideload service only.
|
// the sideload service only.
|
||||||
cc_library {
|
cc_library_static {
|
||||||
name: "libminadbd_services",
|
name: "libminadbd_services",
|
||||||
recovery_available: true,
|
recovery_available: true,
|
||||||
|
|
||||||
@@ -79,6 +79,8 @@ cc_binary {
|
|||||||
|
|
||||||
defaults: [
|
defaults: [
|
||||||
"minadbd_defaults",
|
"minadbd_defaults",
|
||||||
|
"libadbd_binary_dependencies",
|
||||||
|
"librecovery_utils_defaults",
|
||||||
],
|
],
|
||||||
|
|
||||||
srcs: [
|
srcs: [
|
||||||
@@ -86,10 +88,14 @@ cc_binary {
|
|||||||
],
|
],
|
||||||
|
|
||||||
shared_libs: [
|
shared_libs: [
|
||||||
"libadbd",
|
|
||||||
"libbase",
|
"libbase",
|
||||||
"libcrypto",
|
"libcrypto",
|
||||||
|
],
|
||||||
|
|
||||||
|
static_libs: [
|
||||||
"libminadbd_services",
|
"libminadbd_services",
|
||||||
|
"libfusesideload",
|
||||||
|
"librecovery_utils",
|
||||||
],
|
],
|
||||||
|
|
||||||
required: [
|
required: [
|
||||||
@@ -104,6 +110,7 @@ cc_test {
|
|||||||
defaults: [
|
defaults: [
|
||||||
"minadbd_defaults",
|
"minadbd_defaults",
|
||||||
"librecovery_utils_defaults",
|
"librecovery_utils_defaults",
|
||||||
|
"libadbd_binary_dependencies",
|
||||||
],
|
],
|
||||||
|
|
||||||
srcs: [
|
srcs: [
|
||||||
@@ -116,7 +123,6 @@ cc_test {
|
|||||||
"libfusesideload",
|
"libfusesideload",
|
||||||
"librecovery_utils",
|
"librecovery_utils",
|
||||||
"libotautil",
|
"libotautil",
|
||||||
"libadbd",
|
|
||||||
],
|
],
|
||||||
|
|
||||||
shared_libs: [
|
shared_libs: [
|
||||||
|
|||||||
@@ -266,6 +266,10 @@ static void WipeDeviceService(unique_fd fd, const std::string& args) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
asocket* daemon_service_to_socket(std::string_view) {
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
unique_fd daemon_service_to_fd(std::string_view name, atransport* /* transport */) {
|
unique_fd daemon_service_to_fd(std::string_view name, atransport* /* transport */) {
|
||||||
// Common services that are supported both in sideload and rescue modes.
|
// Common services that are supported both in sideload and rescue modes.
|
||||||
if (android::base::ConsumePrefix(&name, "reboot:")) {
|
if (android::base::ConsumePrefix(&name, "reboot:")) {
|
||||||
|
|||||||
Reference in New Issue
Block a user