Remove pairing_auth, pairing_connection from recovery.
Also remove statically linking libc++, because these libraries are not exported native shared libraries. We are slightly over the 12MB limit for ramdisk recovery size, so let's remove the adb pairing libraries, since they won't be used in recovery mode. These are only used in normal boot mode, and currently, only by adb client. The pairing server is used by system server. Bug: 150317254 Test: Check size of ramdisk-recovery.img in walleye, walleye-hwasam build to be under 12MB. Also verify installed-files-recovery.txt no longer contains libadb_pairing*. Also put phone into recovery mode, check system/lib64 for no libadb_pairing*. Change-Id: Ida7c4fdc9dda2b09091b853feac8df8f125e4274
This commit is contained in:
parent
edf2ddd4ac
commit
afc2cf0dec
5 changed files with 34 additions and 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",
|
||||
|
|
|
@ -45,8 +45,6 @@ cc_defaults {
|
|||
host_supported: true,
|
||||
recovery_available: true,
|
||||
|
||||
stl: "libc++_static",
|
||||
|
||||
shared_libs: [
|
||||
"libadb_protos",
|
||||
"libbase",
|
||||
|
|
|
@ -47,7 +47,7 @@ cc_defaults {
|
|||
use_version_lib: false,
|
||||
|
||||
host_supported: true,
|
||||
recovery_available: true,
|
||||
recovery_available: false,
|
||||
|
||||
stl: "libc++_static",
|
||||
|
||||
|
|
|
@ -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",
|
||||
|
||||
|
|
|
@ -42,12 +42,8 @@ cc_defaults {
|
|||
"//system/core/adb:__subpackages__",
|
||||
],
|
||||
|
||||
stl: "libc++_static",
|
||||
|
||||
static_libs: [
|
||||
"libbase",
|
||||
],
|
||||
shared_libs: [
|
||||
"libbase",
|
||||
"libcrypto",
|
||||
"liblog",
|
||||
"libssl",
|
||||
|
|
Loading…
Reference in a new issue