diff options
| author | Tao Bao <tbao@google.com> | 2018-08-08 19:22:14 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-08-08 19:22:14 +0200 |
| commit | 479dd68d9ef2ed2048d222bb238edb8e73ab520a (patch) | |
| tree | f3ae518c905fecf155441f34de10b65dcd9269c8 | |
| parent | Merge "Merge Android Pie into master" (diff) | |
| parent | Merge "Build and use minadbd as a shared library." (diff) | |
| download | android_bootable_recovery-479dd68d9ef2ed2048d222bb238edb8e73ab520a.tar android_bootable_recovery-479dd68d9ef2ed2048d222bb238edb8e73ab520a.tar.gz android_bootable_recovery-479dd68d9ef2ed2048d222bb238edb8e73ab520a.tar.bz2 android_bootable_recovery-479dd68d9ef2ed2048d222bb238edb8e73ab520a.tar.lz android_bootable_recovery-479dd68d9ef2ed2048d222bb238edb8e73ab520a.tar.xz android_bootable_recovery-479dd68d9ef2ed2048d222bb238edb8e73ab520a.tar.zst android_bootable_recovery-479dd68d9ef2ed2048d222bb238edb8e73ab520a.zip | |
| -rw-r--r-- | Android.mk | 7 | ||||
| -rw-r--r-- | fuse_sideload/Android.bp | 3 | ||||
| -rw-r--r-- | minadbd/Android.bp | 16 | ||||
| -rw-r--r-- | tests/Android.mk | 2 |
4 files changed, 18 insertions, 10 deletions
diff --git a/Android.mk b/Android.mk index b25c1f07a..aa959c909 100644 --- a/Android.mk +++ b/Android.mk @@ -127,7 +127,6 @@ health_hal_static_libraries := \ librecovery_static_libraries := \ libbootloader_message \ libfusesideload \ - libminadbd \ libminui \ libverifier \ libotautil \ @@ -170,6 +169,9 @@ LOCAL_CFLAGS := $(recovery_common_cflags) LOCAL_MODULE := librecovery +LOCAL_SHARED_LIBRARIES := \ + libminadbd_services \ + LOCAL_STATIC_LIBRARIES := \ $(librecovery_static_libraries) @@ -199,6 +201,7 @@ LOCAL_STATIC_LIBRARIES := \ $(librecovery_static_libraries) LOCAL_SHARED_LIBRARIES := \ + libminadbd_services \ librecovery_ui \ LOCAL_HAL_STATIC_LIBRARIES := libhealthd @@ -236,7 +239,9 @@ LOCAL_REQUIRED_MODULES += \ # 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 76bc16df9..29404cea2 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 @@ cc_library_static { "include", ], - static_libs: [ + shared_libs: [ "libbase", "libcrypto", ], diff --git a/minadbd/Android.bp b/minadbd/Android.bp index 432b2f0f5..8ccce4f42 100644 --- a/minadbd/Android.bp +++ b/minadbd/Android.bp @@ -26,8 +26,9 @@ cc_defaults { ], } -cc_library_static { - name: "libminadbd", +cc_library { + name: "libminadbd_services", + recovery_available: true, defaults: [ "minadbd_defaults", @@ -39,14 +40,14 @@ cc_library_static { "minadbd_services.cpp", ], - static_libs: [ - "libfusesideload", + shared_libs: [ + "libadbd", "libbase", "libcrypto", ], - whole_static_libs: [ - "libadbd", + static_libs: [ + "libfusesideload", ], } @@ -62,8 +63,9 @@ cc_test { ], static_libs: [ + "libminadbd_services", + "libadbd", "libBionicGtestMain", - "libminadbd", ], shared_libs: [ diff --git a/tests/Android.mk b/tests/Android.mk index 3d3e63e7e..5ef17776c 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -170,7 +170,7 @@ librecovery_static_libraries := \ librecovery \ libbootloader_message \ libfusesideload \ - libminadbd \ + libminadbd_services \ librecovery_ui_default \ librecovery_ui \ libminui \ |