diff options
| author | Oriol Prieto Gasco <opg@google.com> | 2021-09-07 19:04:51 -0400 |
|---|---|---|
| committer | Oriol Prieto Gasco <opg@google.com> | 2021-10-05 16:59:51 +0000 |
| commit | ab33cd554401ee073d15094c6f2cdbb5be90e660 (patch) | |
| tree | 8c86f52bae4ea7017b10bbc0f47e43c6a2e4d1c0 | |
| parent | 58a73ad7cbe0f1a304c96438b147a5b715bd340c (diff) | |
| download | adb-ab33cd554401ee073d15094c6f2cdbb5be90e660.tar.gz | |
Changes to linking strategy
Test: Build and side-load apex module
Bug: 194395180
Changes included:
1) Make dependencies on libbase dynamic (because there are multiple
binaries depending on it)
2) Remove dependency on libcrypto_utils by libadb_pairing_server
(unused)
3) Remove dependecy on libadb_pairing_auth by libadb_pairing_server
(unused)
4) Make the dependency on libadb_pairing_auth static (because only
libadbd_pairing_connection depends on it)
This results in savings of ~400k on the adbd apex file size (for arm32).
Change-Id: I8969dbcdea26f76ddfdb135ca116941c64a1187c
| -rw-r--r-- | libs/adbconnection/Android.bp | 12 | ||||
| -rw-r--r-- | libs/libadbd_fs/Android.bp | 2 | ||||
| -rw-r--r-- | pairing_auth/Android.bp | 2 | ||||
| -rw-r--r-- | pairing_connection/Android.bp | 12 |
4 files changed, 14 insertions, 14 deletions
diff --git a/libs/adbconnection/Android.bp b/libs/adbconnection/Android.bp index da0b5b61..4e177bdc 100644 --- a/libs/adbconnection/Android.bp +++ b/libs/adbconnection/Android.bp @@ -18,8 +18,10 @@ cc_library { export_include_dirs: ["include"], stl: "libc++_static", - shared_libs: ["liblog"], - static_libs: ["libbase"], + shared_libs: [ + "libbase", + "liblog", + ], defaults: ["adbd_defaults", "host_adbd_supported"], @@ -42,8 +44,10 @@ cc_library { export_include_dirs: ["include"], stl: "libc++_static", - shared_libs: ["liblog"], - static_libs: ["libbase"], + shared_libs: [ + "libbase", + "liblog", + ], defaults: ["adbd_defaults"], visibility: [ diff --git a/libs/libadbd_fs/Android.bp b/libs/libadbd_fs/Android.bp index ef7bc106..3c16746e 100644 --- a/libs/libadbd_fs/Android.bp +++ b/libs/libadbd_fs/Android.bp @@ -14,8 +14,8 @@ cc_library { defaults: ["adbd_defaults"], srcs: ["adbd_fs.cpp"], + shared_libs: ["libbase"], static_libs: [ - "libbase", "libcutils", "liblog", ], diff --git a/pairing_auth/Android.bp b/pairing_auth/Android.bp index e2e9fc45..52e647ca 100644 --- a/pairing_auth/Android.bp +++ b/pairing_auth/Android.bp @@ -60,8 +60,8 @@ cc_defaults { stl: "libc++_static", - static_libs: ["libbase"], shared_libs: [ + "libbase", "libcrypto", "liblog", ], diff --git a/pairing_connection/Android.bp b/pairing_connection/Android.bp index 3c5b0a3f..e27b524b 100644 --- a/pairing_connection/Android.bp +++ b/pairing_connection/Android.bp @@ -67,13 +67,13 @@ cc_defaults { recovery_available: false, static_libs: [ - "libbase", + "libadb_pairing_auth", "libssl", ], shared_libs: [ + "libbase", "libcrypto", "liblog", - "libadb_pairing_auth", ], } @@ -146,16 +146,12 @@ cc_defaults { stl: "libc++_static", - static_libs: [ - "libbase", - ], shared_libs: [ + "libadb_pairing_connection", + "libbase", "libcrypto", - "libcrypto_utils", "libcutils", "liblog", - "libadb_pairing_auth", - "libadb_pairing_connection", ], } |