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