summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2018-08-14 01:13:16 +0200
committerandroid-build-merger <android-build-merger@google.com>2018-08-14 01:13:16 +0200
commitd991adf087dae91e26accae100adf80f60761f50 (patch)
treeb6c795f960aa2d52ff5bf32ab9c946149a41a438
parentMerge "Remove TODO for b/112462307" am: 1914bd0f4b (diff)
parentMerge "Reland "Build and use minadbd as a shared library."" (diff)
downloadandroid_bootable_recovery-d991adf087dae91e26accae100adf80f60761f50.tar
android_bootable_recovery-d991adf087dae91e26accae100adf80f60761f50.tar.gz
android_bootable_recovery-d991adf087dae91e26accae100adf80f60761f50.tar.bz2
android_bootable_recovery-d991adf087dae91e26accae100adf80f60761f50.tar.lz
android_bootable_recovery-d991adf087dae91e26accae100adf80f60761f50.tar.xz
android_bootable_recovery-d991adf087dae91e26accae100adf80f60761f50.tar.zst
android_bootable_recovery-d991adf087dae91e26accae100adf80f60761f50.zip
-rw-r--r--Android.bp3
-rw-r--r--minadbd/Android.bp18
-rw-r--r--tests/Android.mk2
3 files changed, 10 insertions, 13 deletions
diff --git a/Android.bp b/Android.bp
index 99e8b652f..630c7965e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -104,7 +104,6 @@ cc_defaults {
],
shared_libs: [
- "libasyncio",
"libbase",
"libbootloader_message",
"libcrypto",
@@ -125,7 +124,6 @@ cc_defaults {
],
static_libs: [
- "libminadbd",
"libminui",
"libverifier",
"libotautil",
@@ -206,6 +204,7 @@ cc_binary {
],
shared_libs: [
+ "libminadbd_services",
"librecovery_ui",
],
diff --git a/minadbd/Android.bp b/minadbd/Android.bp
index 36896795d..00244ee7e 100644
--- a/minadbd/Android.bp
+++ b/minadbd/Android.bp
@@ -26,8 +26,10 @@ cc_defaults {
],
}
-cc_library_static {
- name: "libminadbd",
+// `libminadbd_services` is analogous to the `libadbd_services` for regular `adbd`, but providing
+// the sideload service only.
+cc_library {
+ name: "libminadbd_services",
recovery_available: true,
defaults: [
@@ -40,14 +42,11 @@ cc_library_static {
"minadbd_services.cpp",
],
- static_libs: [
- "libfusesideload",
+ shared_libs: [
+ "libadbd",
"libbase",
"libcrypto",
- ],
-
- whole_static_libs: [
- "libadbd",
+ "libfusesideload",
],
}
@@ -63,8 +62,9 @@ cc_test {
],
static_libs: [
+ "libminadbd_services",
+ "libadbd",
"libBionicGtestMain",
- "libminadbd",
],
shared_libs: [
diff --git a/tests/Android.mk b/tests/Android.mk
index ef64d76ab..b6f5b451f 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -170,14 +170,12 @@ librecovery_static_libraries := \
librecovery \
libbootloader_message \
libfusesideload \
- libminadbd \
librecovery_ui_default \
librecovery_ui \
libminui \
libverifier \
libotautil \
$(health_hal_static_libraries) \
- libasyncio \
libcrypto_utils \
libcrypto \
libext4_utils \