diff options
| -rw-r--r-- | Android.bp | 32 | ||||
| -rw-r--r-- | crypto/Android.bp | 2 | ||||
| -rw-r--r-- | pairing_auth/Android.bp | 2 | ||||
| -rw-r--r-- | pairing_connection/Android.bp | 4 | ||||
| -rw-r--r-- | tls/Android.bp | 6 |
5 files changed, 34 insertions, 12 deletions
@@ -418,6 +418,12 @@ cc_library_static { srcs: [ "daemon/usb_dummy.cpp", ] + }, + recovery: { + exclude_shared_libs: [ + "libadb_pairing_auth", + "libadb_pairing_connection", + ], } }, } @@ -477,6 +483,10 @@ cc_library_static { exclude_srcs: [ "daemon/abb_service.cpp", ], + exclude_shared_libs: [ + "libadb_pairing_auth", + "libadb_pairing_connection", + ], }, }, } @@ -512,6 +522,15 @@ cc_library { "libselinux", ], + target: { + recovery: { + exclude_shared_libs: [ + "libadb_pairing_auth", + "libadb_pairing_connection", + ], + } + }, + static_libs: [ "libadbd_services", "libcutils_sockets", @@ -544,6 +563,8 @@ cc_binary { }, static_libs: [ + "libadb_crypto", + "libadb_tls_connection", "libadbconnection_server", "libadbd", "libadbd_services", @@ -561,15 +582,22 @@ cc_binary { ], shared_libs: [ - "libadb_crypto", "libadb_pairing_connection", "libadb_protos", - "libadb_tls_connection", "libadbd_auth", "libadbd_fs", "libcrypto", ], + target: { + recovery: { + exclude_shared_libs: [ + "libadb_pairing_auth", + "libadb_pairing_connection", + ], + } + }, + required: [ "libadbd_auth", "libadbd_fs", diff --git a/crypto/Android.bp b/crypto/Android.bp index b7f75edd..ce1de4a5 100644 --- a/crypto/Android.bp +++ b/crypto/Android.bp @@ -45,8 +45,6 @@ cc_defaults { host_supported: true, recovery_available: true, - stl: "libc++_static", - shared_libs: [ "libadb_protos", "libbase", diff --git a/pairing_auth/Android.bp b/pairing_auth/Android.bp index 0850047f..a43f4d03 100644 --- a/pairing_auth/Android.bp +++ b/pairing_auth/Android.bp @@ -47,7 +47,7 @@ cc_defaults { use_version_lib: false, host_supported: true, - recovery_available: true, + recovery_available: false, stl: "libc++_static", diff --git a/pairing_connection/Android.bp b/pairing_connection/Android.bp index c0538547..bcde7b1f 100644 --- a/pairing_connection/Android.bp +++ b/pairing_connection/Android.bp @@ -52,7 +52,7 @@ cc_defaults { stl: "libc++_static", host_supported: true, - recovery_available: true, + recovery_available: false, static_libs: [ "libbase", @@ -131,7 +131,7 @@ cc_defaults { ], host_supported: true, - recovery_available: true, + recovery_available: false, stl: "libc++_static", diff --git a/tls/Android.bp b/tls/Android.bp index 49833ff4..f2837e11 100644 --- a/tls/Android.bp +++ b/tls/Android.bp @@ -42,12 +42,8 @@ cc_defaults { "//system/core/adb:__subpackages__", ], - stl: "libc++_static", - - static_libs: [ - "libbase", - ], shared_libs: [ + "libbase", "libcrypto", "liblog", "libssl", |