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