diff options
| author | Jerry Zhang <zhangjerry@google.com> | 2018-07-17 23:20:55 +0200 |
|---|---|---|
| committer | Hridya Valsaraju <hridya@google.com> | 2018-07-20 19:54:03 +0200 |
| commit | c936a6961940a15f7f95befcf35425bad8fa4f7c (patch) | |
| tree | 1dedf7b8e1ee1c996fd102e04fb825e2c01f49aa | |
| parent | Merge "Fix the arguments passed to getopt_long(3)." (diff) | |
| download | android_bootable_recovery-c936a6961940a15f7f95befcf35425bad8fa4f7c.tar android_bootable_recovery-c936a6961940a15f7f95befcf35425bad8fa4f7c.tar.gz android_bootable_recovery-c936a6961940a15f7f95befcf35425bad8fa4f7c.tar.bz2 android_bootable_recovery-c936a6961940a15f7f95befcf35425bad8fa4f7c.tar.lz android_bootable_recovery-c936a6961940a15f7f95befcf35425bad8fa4f7c.tar.xz android_bootable_recovery-c936a6961940a15f7f95befcf35425bad8fa4f7c.tar.zst android_bootable_recovery-c936a6961940a15f7f95befcf35425bad8fa4f7c.zip | |
| -rw-r--r-- | Android.mk | 7 | ||||
| -rw-r--r-- | bootloader_message/Android.bp | 5 | ||||
| -rw-r--r-- | fuse_sideload/Android.bp | 3 | ||||
| -rw-r--r-- | minadbd/Android.bp | 8 | ||||
| -rw-r--r-- | otautil/Android.bp | 5 | ||||
| -rw-r--r-- | tests/Android.mk | 7 |
6 files changed, 27 insertions, 8 deletions
diff --git a/Android.mk b/Android.mk index 906fcd6a5..0a9a33a75 100644 --- a/Android.mk +++ b/Android.mk @@ -120,11 +120,18 @@ librecovery_static_libraries := \ libverifier \ libotautil \ $(health_hal_static_libraries) \ + libadbd \ libasyncio \ + libavb_user \ + libdiagnose_usb \ libcrypto_utils \ libcrypto \ libext4_utils \ libfs_mgr \ + libfec \ + libfec_rs \ + libsquashfs_utils \ + liblogwrap \ libpng \ libsparse \ libvintf_recovery \ diff --git a/bootloader_message/Android.bp b/bootloader_message/Android.bp index ab23733cd..6155daad4 100644 --- a/bootloader_message/Android.bp +++ b/bootloader_message/Android.bp @@ -14,7 +14,7 @@ // limitations under the License. // -cc_library_static { +cc_library { name: "libbootloader_message", recovery_available: true, srcs: ["bootloader_message.cpp"], @@ -22,9 +22,10 @@ cc_library_static { "-Wall", "-Werror", ], - static_libs: [ + shared_libs: [ "libbase", "libfs_mgr", + "liblog", ], export_include_dirs: ["include"], } 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..0ef4af9b3 100644 --- a/minadbd/Android.bp +++ b/minadbd/Android.bp @@ -28,6 +28,7 @@ cc_defaults { cc_library_static { name: "libminadbd", + recovery_available: true, defaults: [ "minadbd_defaults", @@ -41,12 +42,12 @@ cc_library_static { static_libs: [ "libfusesideload", - "libbase", - "libcrypto", ], - whole_static_libs: [ + shared_libs: [ "libadbd", + "libbase", + "libcrypto", ], } @@ -67,6 +68,7 @@ cc_test { ], shared_libs: [ + "libadbd", "libbase", "libcutils", "liblog", diff --git a/otautil/Android.bp b/otautil/Android.bp index b058f7b35..16af7e781 100644 --- a/otautil/Android.bp +++ b/otautil/Android.bp @@ -16,6 +16,7 @@ cc_library_static { name: "libotautil", host_supported: true, + recovery_available: true, // Minimal set of files to support host build. srcs: [ @@ -23,7 +24,7 @@ cc_library_static { "rangeset.cpp", ], - static_libs: [ + shared_libs: [ "libbase", ], @@ -46,7 +47,7 @@ cc_library_static { "thermalutil.cpp", ], - static_libs: [ + shared_libs: [ "libselinux", "libcutils", ], diff --git a/tests/Android.mk b/tests/Android.mk index daec11f11..de55587fe 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -176,10 +176,17 @@ librecovery_static_libraries := \ libotautil \ $(health_hal_static_libraries) \ libasyncio \ + libadbd \ + libavb_user \ + libdiagnose_usb \ libcrypto_utils \ libcrypto \ libext4_utils \ libfs_mgr \ + libfec \ + libfec_rs \ + libsquashfs_utils \ + liblogwrap \ libpng \ libsparse \ libvintf_recovery \ |