tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Remove pairing_auth, pairing_connection from recovery."

Browse source
This commit is contained in:
Joshua Duong 2020-02-29 00:47:44 +00:00 committed by Gerrit Code Review
commit ad9d034e7d
5 changed files with 34 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
adb/Android.bp
View file

@ -419,6 +419,12 @@ cc_library_static {
srcs: [
"daemon/usb_dummy.cpp",
]
},
recovery: {
exclude_shared_libs: [
"libadb_pairing_auth",
"libadb_pairing_connection",
],
}
},
}
@ -478,6 +484,10 @@ cc_library_static {
exclude_srcs: [
"daemon/abb_service.cpp",
],
exclude_shared_libs: [
"libadb_pairing_auth",
"libadb_pairing_connection",
],
},
},
}
@ -513,6 +523,15 @@ cc_library {
"libselinux",
],
target: {
recovery: {
exclude_shared_libs: [
"libadb_pairing_auth",
"libadb_pairing_connection",
],
}
},
static_libs: [
"libadbd_services",
"libcutils_sockets",
@ -545,6 +564,8 @@ cc_binary {
},
static_libs: [
"libadb_crypto",
"libadb_tls_connection",
"libadbconnection_server",
"libadbd",
"libadbd_services",
@ -562,15 +583,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",

2
adb/crypto/Android.bp
View file

@ -45,8 +45,6 @@ cc_defaults {
host_supported: true,
recovery_available: true,
stl: "libc++_static",
shared_libs: [
"libadb_protos",
"libbase",

2
adb/pairing_auth/Android.bp
View file

@ -47,7 +47,7 @@ cc_defaults {
use_version_lib: false,
host_supported: true,
recovery_available: true,
recovery_available: false,
stl: "libc++_static",

4
adb/pairing_connection/Android.bp
View file

@ -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",

6
adb/tls/Android.bp
View file

@ -42,12 +42,8 @@ cc_defaults {
"//system/core/adb:__subpackages__",
],
stl: "libc++_static",
static_libs: [
"libbase",
],
shared_libs: [
"libbase",
"libcrypto",
"liblog",
"libssl",