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

Android.mk

@@ -127,6 +127,7 @@ health_hal_static_libraries := \
 librecovery_static_libraries := \
     libbootloader_message \
     libfusesideload \
+    libminadbd \
     libminui \
     libverifier \
     libotautil \
@@ -169,9 +170,6 @@ LOCAL_CFLAGS := $(recovery_common_cflags)
 
 LOCAL_MODULE := librecovery
 
-LOCAL_SHARED_LIBRARIES := \
-    libminadbd_services \
-
 LOCAL_STATIC_LIBRARIES := \
     $(librecovery_static_libraries)
 
@@ -201,7 +199,6 @@ LOCAL_STATIC_LIBRARIES := \
     $(librecovery_static_libraries)
 
 LOCAL_SHARED_LIBRARIES := \
-    libminadbd_services \
     librecovery_ui \
 
 LOCAL_HAL_STATIC_LIBRARIES := libhealthd
@@ -239,9 +236,7 @@ LOCAL_REQUIRED_MODULES += \
 # module is built with Soong (with `recovery: true` flag).
 LOCAL_REQUIRED_MODULES += \
     libbase.recovery \
-    libcrypto.recovery \
     liblog.recovery \
-    libminadbd_services.recovery \
     libpng.recovery \
     libz.recovery \
 

fuse_sideload/Android.bp

@@ -14,7 +14,6 @@
 
 cc_library_static {
     name: "libfusesideload",
-    recovery_available: true,
 
     cflags: [
         "-D_XOPEN_SOURCE",
@@ -31,7 +30,7 @@ cc_library_static {
         "include",
     ],
 
-    shared_libs: [
+    static_libs: [
         "libbase",
         "libcrypto",
     ],

minadbd/Android.bp

@@ -26,9 +26,8 @@ cc_defaults {
     ],
 }
 
-cc_library {
-    name: "libminadbd_services",
-    recovery_available: true,
+cc_library_static {
+    name: "libminadbd",
 
     defaults: [
         "minadbd_defaults",
@@ -40,14 +39,14 @@ cc_library {
         "minadbd_services.cpp",
     ],
 
-    shared_libs: [
-        "libadbd",
+    static_libs: [
+        "libfusesideload",
         "libbase",
         "libcrypto",
     ],
 
-    static_libs: [
-        "libfusesideload",
+    whole_static_libs: [
+        "libadbd",
     ],
 }
 
@@ -63,9 +62,8 @@ cc_test {
     ],
 
     static_libs: [
-        "libminadbd_services",
-        "libadbd",
         "libBionicGtestMain",
+        "libminadbd",
     ],
 
     shared_libs: [

tests/Android.mk

@@ -170,7 +170,7 @@ librecovery_static_libraries := \
     librecovery \
     libbootloader_message \
     libfusesideload \
-    libminadbd_services \
+    libminadbd \
     librecovery_ui_default \
     librecovery_ui \
     libminui \