Revert "Make recovery libraries shared / recovery_available"
This reverts commit c936a6961940a15f7f95befcf35425bad8fa4f7c.
Reason for revert: b/111734137
Change-Id: Ie9c1fdc75d6e87dba7019c4e6d1799af25c2f94a
diff --git a/Android.mk b/Android.mk
index 0a9a33a..906fcd6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -120,18 +120,11 @@
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 \
diff --git a/bootloader_message/Android.bp b/bootloader_message/Android.bp
index 6155daa..ab23733 100644
--- a/bootloader_message/Android.bp
+++ b/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 @@
"-Wall",
"-Werror",
],
- shared_libs: [
+ static_libs: [
"libbase",
"libfs_mgr",
- "liblog",
],
export_include_dirs: ["include"],
}
diff --git a/fuse_sideload/Android.bp b/fuse_sideload/Android.bp
index 29404ce..76bc16d 100644
--- a/fuse_sideload/Android.bp
+++ b/fuse_sideload/Android.bp
@@ -14,7 +14,6 @@
cc_library_static {
name: "libfusesideload",
- recovery_available: true,
cflags: [
"-D_XOPEN_SOURCE",
@@ -31,7 +30,7 @@
"include",
],
- shared_libs: [
+ static_libs: [
"libbase",
"libcrypto",
],
diff --git a/minadbd/Android.bp b/minadbd/Android.bp
index 0ef4af9..432b2f0 100644
--- a/minadbd/Android.bp
+++ b/minadbd/Android.bp
@@ -28,7 +28,6 @@
cc_library_static {
name: "libminadbd",
- recovery_available: true,
defaults: [
"minadbd_defaults",
@@ -42,13 +41,13 @@
static_libs: [
"libfusesideload",
- ],
-
- shared_libs: [
- "libadbd",
"libbase",
"libcrypto",
],
+
+ whole_static_libs: [
+ "libadbd",
+ ],
}
cc_test {
@@ -68,7 +67,6 @@
],
shared_libs: [
- "libadbd",
"libbase",
"libcutils",
"liblog",
diff --git a/otautil/Android.bp b/otautil/Android.bp
index 16af7e7..b058f7b 100644
--- a/otautil/Android.bp
+++ b/otautil/Android.bp
@@ -16,7 +16,6 @@
name: "libotautil",
host_supported: true,
- recovery_available: true,
// Minimal set of files to support host build.
srcs: [
@@ -24,7 +23,7 @@
"rangeset.cpp",
],
- shared_libs: [
+ static_libs: [
"libbase",
],
@@ -47,7 +46,7 @@
"thermalutil.cpp",
],
- shared_libs: [
+ static_libs: [
"libselinux",
"libcutils",
],
diff --git a/tests/Android.mk b/tests/Android.mk
index de55587..daec11f 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -176,17 +176,10 @@
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 \