summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHridya Valsaraju <hridya@google.com>2018-07-23 21:54:41 +0200
committerandroid-build-merger <android-build-merger@google.com>2018-07-23 21:54:41 +0200
commitee5163cb1e5eefb7a7128b256fee92fe4126f234 (patch)
tree55c4505038bff95f0c4426091a200f2f9be870df
parentMerge "applypatch: Change applypatch command-line arguments." am: 860b457a15 am: 7d2962b942 am: 4ad9995b5b (diff)
parentMerge "Revert "Make recovery libraries shared / recovery_available"" into stage-aosp-master am: 5c9e580f4f (diff)
downloadandroid_bootable_recovery-ee5163cb1e5eefb7a7128b256fee92fe4126f234.tar
android_bootable_recovery-ee5163cb1e5eefb7a7128b256fee92fe4126f234.tar.gz
android_bootable_recovery-ee5163cb1e5eefb7a7128b256fee92fe4126f234.tar.bz2
android_bootable_recovery-ee5163cb1e5eefb7a7128b256fee92fe4126f234.tar.lz
android_bootable_recovery-ee5163cb1e5eefb7a7128b256fee92fe4126f234.tar.xz
android_bootable_recovery-ee5163cb1e5eefb7a7128b256fee92fe4126f234.tar.zst
android_bootable_recovery-ee5163cb1e5eefb7a7128b256fee92fe4126f234.zip
-rw-r--r--Android.mk7
-rw-r--r--bootloader_message/Android.bp5
-rw-r--r--fuse_sideload/Android.bp3
-rw-r--r--minadbd/Android.bp8
-rw-r--r--otautil/Android.bp5
-rw-r--r--tests/Android.mk7
6 files changed, 8 insertions, 27 deletions
diff --git a/Android.mk b/Android.mk
index 0a9a33a75..906fcd6a5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -120,18 +120,11 @@ 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 6155daad4..ab23733cd 100644
--- a/bootloader_message/Android.bp
+++ b/bootloader_message/Android.bp
@@ -14,7 +14,7 @@
// limitations under the License.
//
-cc_library {
+cc_library_static {
name: "libbootloader_message",
recovery_available: true,
srcs: ["bootloader_message.cpp"],
@@ -22,10 +22,9 @@ cc_library {
"-Wall",
"-Werror",
],
- shared_libs: [
+ static_libs: [
"libbase",
"libfs_mgr",
- "liblog",
],
export_include_dirs: ["include"],
}
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 0ef4af9b3..432b2f0f5 100644
--- a/minadbd/Android.bp
+++ b/minadbd/Android.bp
@@ -28,7 +28,6 @@ cc_defaults {
cc_library_static {
name: "libminadbd",
- recovery_available: true,
defaults: [
"minadbd_defaults",
@@ -42,12 +41,12 @@ cc_library_static {
static_libs: [
"libfusesideload",
+ "libbase",
+ "libcrypto",
],
- shared_libs: [
+ whole_static_libs: [
"libadbd",
- "libbase",
- "libcrypto",
],
}
@@ -68,7 +67,6 @@ cc_test {
],
shared_libs: [
- "libadbd",
"libbase",
"libcutils",
"liblog",
diff --git a/otautil/Android.bp b/otautil/Android.bp
index 16af7e781..b058f7b35 100644
--- a/otautil/Android.bp
+++ b/otautil/Android.bp
@@ -16,7 +16,6 @@ cc_library_static {
name: "libotautil",
host_supported: true,
- recovery_available: true,
// Minimal set of files to support host build.
srcs: [
@@ -24,7 +23,7 @@ cc_library_static {
"rangeset.cpp",
],
- shared_libs: [
+ static_libs: [
"libbase",
],
@@ -47,7 +46,7 @@ cc_library_static {
"thermalutil.cpp",
],
- shared_libs: [
+ static_libs: [
"libselinux",
"libcutils",
],
diff --git a/tests/Android.mk b/tests/Android.mk
index de55587fe..daec11f11 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -176,17 +176,10 @@ 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 \