Revert "Build and use minadbd as a shared library."
This reverts commit 4fd4f89591fe826cf26167bccaeb2802f14fbdc8.
The reverted CL has a side effect that unintentionally installs
a copy of libminadbd_services.so to the system image. This breaks the
check with `build/soong/build_test.bash --dist` which detects and
prevents vendor modules from installing files to the system image.
Prior to fully converting `recovery` to be built with Soong, we have to
statically link recovery-specific modules into `recovery`.
Bug: 110380063
Test: `m -j bootimage` with aosp_marlin-userdebug
Test: Run minadbd_test on marlin.
Test: Boot into recovery and verify that sideloading still works.
Test: `build/soong/build_test.bash --dist`
Change-Id: I290d55c82e17aa60a5afdf2ff7f896afc4dae8b3
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: [