ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "adbd: make libadbd_services cc_library again."

Browse source
This commit is contained in:
Tianjie Xu 2020-03-10 18:43:30 +00:00 • committed by Gerrit Code Review
commit 0ac447ab95
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
adb/Android.bp
View file

@ -437,7 +437,7 @@ cc_library_static {
}, },
} }
cc_library_static { cc_library {
name: "libadbd_services", name: "libadbd_services",
defaults: ["adbd_defaults", "host_adbd_supported"], defaults: ["adbd_defaults", "host_adbd_supported"],
recovery_available: true, recovery_available: true,
@ -474,6 +474,7 @@ cc_library_static {
"libbase", "libbase",
"libcrypto", "libcrypto",
"libcrypto_utils", "libcrypto_utils",
"libcutils_sockets",
"liblog", "liblog",
], ],
@ -527,6 +528,7 @@ cc_library {
"libadb_tls_connection", "libadb_tls_connection",
"libadbd_auth", "libadbd_auth",
"libadbd_fs", "libadbd_fs",
"libadbd_services",
"libasyncio", "libasyncio",
"libbase", "libbase",
"libcrypto", "libcrypto",
@ -545,7 +547,6 @@ cc_library {
}, },
static_libs: [ static_libs: [
"libadbd_services",
"libcutils_sockets", "libcutils_sockets",
"libdiagnose_usb", "libdiagnose_usb",
"libmdnssd", "libmdnssd",

7
libcutils/Android.bp
View file

@ -49,13 +49,9 @@ cc_library_headers {
} }
// Socket specific parts of libcutils that are safe to statically link into an APEX. // Socket specific parts of libcutils that are safe to statically link into an APEX.
cc_library_static { cc_library {
name: "libcutils_sockets", name: "libcutils_sockets",
vendor_available: true, vendor_available: true,
vndk: {
enabled: true,
support_system_process: true,
},
recovery_available: true, recovery_available: true,
host_supported: true, host_supported: true,
native_bridge_supported: true, native_bridge_supported: true,
@ -66,6 +62,7 @@ cc_library_static {
export_include_dirs: ["include"], export_include_dirs: ["include"],
shared_libs: ["liblog"],
srcs: ["sockets.cpp"], srcs: ["sockets.cpp"],
target: { target: {
linux_bionic: { linux_bionic: {