diff options
| author | Josh Gao <jmgao@google.com> | 2020-03-31 10:41:06 +0200 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-31 10:41:06 +0200 |
| commit | e12e77f6216ec062e2fdf5e635dc55d3de0b5336 (patch) | |
| tree | daad63a4ab254b9fb8d095878b9e67038da856c2 | |
| parent | DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master (diff) | |
| parent | Merge "minadbd: statically link libadbd." (diff) | |
| download | android_bootable_recovery-e12e77f6216ec062e2fdf5e635dc55d3de0b5336.tar android_bootable_recovery-e12e77f6216ec062e2fdf5e635dc55d3de0b5336.tar.gz android_bootable_recovery-e12e77f6216ec062e2fdf5e635dc55d3de0b5336.tar.bz2 android_bootable_recovery-e12e77f6216ec062e2fdf5e635dc55d3de0b5336.tar.lz android_bootable_recovery-e12e77f6216ec062e2fdf5e635dc55d3de0b5336.tar.xz android_bootable_recovery-e12e77f6216ec062e2fdf5e635dc55d3de0b5336.tar.zst android_bootable_recovery-e12e77f6216ec062e2fdf5e635dc55d3de0b5336.zip | |
| -rw-r--r-- | minadbd/Android.bp | 12 | ||||
| -rw-r--r-- | minadbd/minadbd_services.cpp | 4 |
2 files changed, 13 insertions, 3 deletions
diff --git a/minadbd/Android.bp b/minadbd/Android.bp index c39c73443..793680f33 100644 --- a/minadbd/Android.bp +++ b/minadbd/Android.bp @@ -34,7 +34,7 @@ cc_defaults { // `libminadbd_services` is analogous to the `libadbd_services` for regular `adbd`, but providing // the sideload service only. -cc_library { +cc_library_static { name: "libminadbd_services", recovery_available: true, @@ -79,6 +79,8 @@ cc_binary { defaults: [ "minadbd_defaults", + "libadbd_binary_dependencies", + "librecovery_utils_defaults", ], srcs: [ @@ -86,10 +88,14 @@ cc_binary { ], shared_libs: [ - "libadbd", "libbase", "libcrypto", + ], + + static_libs: [ "libminadbd_services", + "libfusesideload", + "librecovery_utils", ], required: [ @@ -104,6 +110,7 @@ cc_test { defaults: [ "minadbd_defaults", "librecovery_utils_defaults", + "libadbd_binary_dependencies", ], srcs: [ @@ -116,7 +123,6 @@ cc_test { "libfusesideload", "librecovery_utils", "libotautil", - "libadbd", ], shared_libs: [ diff --git a/minadbd/minadbd_services.cpp b/minadbd/minadbd_services.cpp index eb91fb3e4..ff91ba931 100644 --- a/minadbd/minadbd_services.cpp +++ b/minadbd/minadbd_services.cpp @@ -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 */) { // Common services that are supported both in sideload and rescue modes. if (android::base::ConsumePrefix(&name, "reboot:")) { |