Merge "Reland "Build and use minadbd as a shared library.""

am: 337bd80b78

Change-Id: Iae00627d92cc7761afe1d99005287284793bbaa8

Android.bp

@@ -104,7 +104,6 @@ cc_defaults {
     ],
 
     shared_libs: [
-        "libasyncio",
         "libbase",
         "libbootloader_message",
         "libcrypto",
@@ -125,7 +124,6 @@ cc_defaults {
     ],
 
     static_libs: [
-        "libminadbd",
         "libminui",
         "libverifier",
         "libotautil",
@@ -206,6 +204,7 @@ cc_binary {
     ],
 
     shared_libs: [
+        "libminadbd_services",
         "librecovery_ui",
     ],
 

minadbd/Android.bp

@@ -26,8 +26,10 @@ cc_defaults {
     ],
 }
 
-cc_library_static {
-    name: "libminadbd",
+// `libminadbd_services` is analogous to the `libadbd_services` for regular `adbd`, but providing
+// the sideload service only.
+cc_library {
+    name: "libminadbd_services",
     recovery_available: true,
 
     defaults: [
@@ -40,14 +42,11 @@ cc_library_static {
         "minadbd_services.cpp",
     ],
 
-    static_libs: [
-        "libfusesideload",
+    shared_libs: [
+        "libadbd",
         "libbase",
         "libcrypto",
-    ],
-
-    whole_static_libs: [
-        "libadbd",
+        "libfusesideload",
     ],
 }
 
@@ -63,8 +62,9 @@ cc_test {
     ],
 
     static_libs: [
+        "libminadbd_services",
+        "libadbd",
         "libBionicGtestMain",
-        "libminadbd",
     ],
 
     shared_libs: [

tests/Android.mk

@@ -170,14 +170,12 @@ librecovery_static_libraries := \
     librecovery \
     libbootloader_message \
     libfusesideload \
-    libminadbd \
     librecovery_ui_default \
     librecovery_ui \
     libminui \
     libverifier \
     libotautil \
     $(health_hal_static_libraries) \
-    libasyncio \
     libcrypto_utils \
     libcrypto \
     libext4_utils \