Merge "Revert "Make recovery libraries shared / recovery_available"" into stage-aosp-master

am: 5c9e580f4f

Change-Id: Ia92390634bc67f3cffbe3a2644af52abee2bd07f

Android.mk

@@ -120,18 +120,11 @@ librecovery_static_libraries := \
     libverifier \
     libotautil \
     $(health_hal_static_libraries) \
-    libadbd \
     libasyncio \
-    libavb_user \
-    libdiagnose_usb \
     libcrypto_utils \
     libcrypto \
     libext4_utils \
     libfs_mgr \
-    libfec \
-    libfec_rs \
-    libsquashfs_utils \
-    liblogwrap \
     libpng \
     libsparse \
     libvintf_recovery \

bootloader_message/Android.bp

@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 
-cc_library {
+cc_library_static {
     name: "libbootloader_message",
     recovery_available: true,
     srcs: ["bootloader_message.cpp"],
@@ -22,10 +22,9 @@ cc_library {
         "-Wall",
         "-Werror",
     ],
-    shared_libs: [
+    static_libs: [
         "libbase",
         "libfs_mgr",
-        "liblog",
     ],
     export_include_dirs: ["include"],
 }

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

@@ -28,7 +28,6 @@ cc_defaults {
 
 cc_library_static {
     name: "libminadbd",
-    recovery_available: true,
 
     defaults: [
         "minadbd_defaults",
@@ -42,13 +41,13 @@ cc_library_static {
 
     static_libs: [
         "libfusesideload",
-    ],
-
-    shared_libs: [
-        "libadbd",
         "libbase",
         "libcrypto",
     ],
+
+    whole_static_libs: [
+        "libadbd",
+    ],
 }
 
 cc_test {
@@ -68,7 +67,6 @@ cc_test {
     ],
 
     shared_libs: [
-        "libadbd",
         "libbase",
         "libcutils",
         "liblog",

otautil/Android.bp

@@ -16,7 +16,6 @@ cc_library_static {
     name: "libotautil",
 
     host_supported: true,
-    recovery_available: true,
 
     // Minimal set of files to support host build.
     srcs: [
@@ -24,7 +23,7 @@ cc_library_static {
         "rangeset.cpp",
     ],
 
-    shared_libs: [
+    static_libs: [
         "libbase",
     ],
 
@@ -47,7 +46,7 @@ cc_library_static {
                 "thermalutil.cpp",
             ],
 
-            shared_libs: [
+            static_libs: [
                 "libselinux",
                 "libcutils",
             ],

tests/Android.mk

@@ -176,17 +176,10 @@ librecovery_static_libraries := \
     libotautil \
     $(health_hal_static_libraries) \
     libasyncio \
-    libadbd \
-    libavb_user \
-    libdiagnose_usb \
     libcrypto_utils \
     libcrypto \
     libext4_utils \
     libfs_mgr \
-    libfec \
-    libfec_rs \
-    libsquashfs_utils \
-    liblogwrap \
     libpng \
     libsparse \
     libvintf_recovery \