Merge "Revert "Build and use minadbd as a shared library."" am: 08cf9ccb2f
am: 60e218cb5e
Change-Id: Icd65d8a26f5e619f3ce08727ca673cc4a65a0570
diff --git a/Android.mk b/Android.mk
index aa959c9..b25c1f0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -127,6 +127,7 @@
librecovery_static_libraries := \
libbootloader_message \
libfusesideload \
+ libminadbd \
libminui \
libverifier \
libotautil \
@@ -169,9 +170,6 @@
LOCAL_MODULE := librecovery
-LOCAL_SHARED_LIBRARIES := \
- libminadbd_services \
-
LOCAL_STATIC_LIBRARIES := \
$(librecovery_static_libraries)
@@ -201,7 +199,6 @@
$(librecovery_static_libraries)
LOCAL_SHARED_LIBRARIES := \
- libminadbd_services \
librecovery_ui \
LOCAL_HAL_STATIC_LIBRARIES := libhealthd
@@ -239,9 +236,7 @@
# 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 \
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 8ccce4f..432b2f0 100644
--- a/minadbd/Android.bp
+++ b/minadbd/Android.bp
@@ -26,9 +26,8 @@
],
}
-cc_library {
- name: "libminadbd_services",
- recovery_available: true,
+cc_library_static {
+ name: "libminadbd",
defaults: [
"minadbd_defaults",
@@ -40,14 +39,14 @@
"minadbd_services.cpp",
],
- shared_libs: [
- "libadbd",
+ static_libs: [
+ "libfusesideload",
"libbase",
"libcrypto",
],
- static_libs: [
- "libfusesideload",
+ whole_static_libs: [
+ "libadbd",
],
}
@@ -63,9 +62,8 @@
],
static_libs: [
- "libminadbd_services",
- "libadbd",
"libBionicGtestMain",
+ "libminadbd",
],
shared_libs: [
diff --git a/tests/Android.mk b/tests/Android.mk
index 5ef1777..3d3e63e 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -170,7 +170,7 @@
librecovery \
libbootloader_message \
libfusesideload \
- libminadbd_services \
+ libminadbd \
librecovery_ui_default \
librecovery_ui \
libminui \