tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
platform_system_core/adb/Android.bp
Josh Gao c51726cbec adbd: implement a nonblocking USB Connection. 
Implement a Connection that implements a nonblocking interface to
functionfs, to replace the existing implementation that uses two
threads that loop and call read and write respectively. The existing
implementation is vulnerable to a race condition that can occur when a
connection is terminated, where one thread can notice failure and
complete reinitialization of the USB endpoints before the other thread
noticed anything went wrong, resulting in either the first packet
coming from the other end disappearing in to the void, or the other end
getting a packet of garbage.

As a side benefit, this improves performance on walleye from:

    push 100MiB: 10 runs: median 49.48 MiB/s, mean 50.00 MiB/s, stddev: 2.77 MiB/s
    pull 100MiB: 10 runs: median 75.82 MiB/s, mean 76.18 MiB/s, stddev: 6.60 MiB/s

to:

    push 100MiB: 10 runs: median 73.90 MiB/s, mean 73.51 MiB/s, stddev: 5.26 MiB/s
    pull 100MiB: 10 runs: median 105.90 MiB/s, mean 107.19 MiB/s, stddev: 6.10 MiB/s

Test: python test_device.py
Change-Id: I9b77c1057965edfef739ed9736e5d76613adf60a
2018-10-19 17:53:18 -07:00

514 lines
11 KiB
Text
Raw Blame History

// Copyright (C) 2017 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
cc_defaults {
name: "adb_defaults",
cflags: [
"-Wall",
"-Wextra",
"-Werror",
"-Wexit-time-destructors",
"-Wno-unused-parameter",
"-Wno-missing-field-initializers",
"-Wvla",
],
rtti: true,
cpp_std: "gnu++17",
use_version_lib: true,
compile_multilib: "first",
product_variables: {
debuggable: {
cflags: [
"-DALLOW_ADBD_ROOT",
"-DALLOW_ADBD_DISABLE_VERITY",
"-DALLOW_ADBD_NO_AUTH",
],
},
},
target: {
android: {
cflags: [
"-DADB_HOST=0",
"-Wthread-safety",
],
},
host: {
cflags: ["-DADB_HOST=1"],
},
darwin: {
host_ldlibs: [
"-lpthread",
"-framework CoreFoundation",
"-framework IOKit",
"-lobjc",
],
},
windows: {
cflags: [
// Define windows.h and tchar.h Unicode preprocessor symbols so that
// CreateFile(), _tfopen(), etc. map to versions that take wchar_t*, breaking the
// build if you accidentally pass char*. Fix by calling like:
// std::wstring path_wide;
// if (!android::base::UTF8ToWide(path_utf8, &path_wide)) { /* error handling */ }
// CreateFileW(path_wide.c_str());
"-DUNICODE=1",
"-D_UNICODE=1",
// -std=gnu++11 doesn't set _GNU_SOURCE on Windows.
"-D_GNU_SOURCE",
// MinGW hides some things behind _POSIX_SOURCE.
"-D_POSIX_SOURCE",
],
host_ldlibs: [
"-lws2_32",
"-lgdi32",
"-luserenv",
],
},
not_windows: {
cflags: [
"-Wthread-safety",
],
},
},
}
// libadb
// =========================================================
// These files are compiled for both the host and the device.
libadb_srcs = [
"adb.cpp",
"adb_io.cpp",
"adb_listeners.cpp",
"adb_trace.cpp",
"adb_unique_fd.cpp",
"adb_utils.cpp",
"fdevent.cpp",
"services.cpp",
"sockets.cpp",
"socket_spec.cpp",
"sysdeps/errno.cpp",
"transport.cpp",
"transport_fd.cpp",
"transport_local.cpp",
"transport_usb.cpp",
]
libadb_posix_srcs = [
"sysdeps_unix.cpp",
"sysdeps/posix/network.cpp",
]
libadb_test_srcs = [
"adb_io_test.cpp",
"adb_listeners_test.cpp",
"adb_utils_test.cpp",
"fdevent_test.cpp",
"socket_spec_test.cpp",
"socket_test.cpp",
"sysdeps_test.cpp",
"sysdeps/stat_test.cpp",
"transport_test.cpp",
"types_test.cpp",
]
cc_library_host_static {
name: "libadb_host",
defaults: ["adb_defaults"],
srcs: libadb_srcs + [
"client/auth.cpp",
"client/usb_libusb.cpp",
"client/usb_dispatch.cpp",
"client/transport_mdns.cpp",
"client/fastdeploy.cpp",
"client/fastdeploycallbacks.cpp",
],
generated_headers: ["platform_tools_version"],
target: {
linux: {
srcs: ["client/usb_linux.cpp"],
},
darwin: {
srcs: ["client/usb_osx.cpp"],
},
not_windows: {
srcs: libadb_posix_srcs,
},
windows: {
enabled: true,
srcs: [
"client/usb_windows.cpp",
"sysdeps_win32.cpp",
"sysdeps/win32/errno.cpp",
"sysdeps/win32/stat.cpp",
],
shared_libs: ["AdbWinApi"],
},
},
static_libs: [
"libbase",
"libcrypto_utils",
"libcrypto",
"libdiagnose_usb",
"libmdnssd",
"libusb",
"libandroidfw",
"libziparchive",
"libz",
"libutils",
"liblog",
"libcutils",
],
}
cc_test_host {
name: "adb_test",
defaults: ["adb_defaults"],
srcs: libadb_test_srcs,
static_libs: [
"libadb_host",
"libbase",
"libcutils",
"libcrypto_utils",
"libcrypto",
"libmdnssd",
"libdiagnose_usb",
"libusb",
],
target: {
windows: {
enabled: true,
shared_libs: ["AdbWinApi"],
},
},
}
cc_benchmark {
name: "adb_benchmark",
defaults: ["adb_defaults"],
srcs: ["transport_benchmark.cpp"],
target: {
android: {
static_libs: [
"libadbd",
],
},
host: {
static_libs: [
"libadb_host",
],
},
},
static_libs: [
"libbase",
"libcutils",
"libcrypto_utils",
"libcrypto",
"libdiagnose_usb",
"liblog",
"libusb",
],
}
cc_binary_host {
name: "adb",
defaults: ["adb_defaults"],
srcs: [
"client/adb_client.cpp",
"client/bugreport.cpp",
"client/commandline.cpp",
"client/file_sync_client.cpp",
"client/main.cpp",
"client/console.cpp",
"client/adb_install.cpp",
"client/line_printer.cpp",
"shell_service_protocol.cpp",
],
static_libs: [
"libadb_host",
"libbase",
"libcutils",
"libcrypto_utils",
"libcrypto",
"libdiagnose_usb",
"liblog",
"libmdnssd",
"libusb",
"libandroidfw",
"libziparchive",
"libz",
"libutils",
"liblog",
"libcutils",
],
stl: "libc++_static",
// Don't add anything here, we don't want additional shared dependencies
// on the host adb tool, and shared libraries that link against libc++
// will violate ODR
shared_libs: [],
required: [
"deploypatchgenerator",
],
target: {
darwin: {
cflags: [
"-Wno-sizeof-pointer-memaccess",
],
},
windows: {
enabled: true,
ldflags: ["-municode"],
shared_libs: ["AdbWinApi"],
required: [
"AdbWinUsbApi",
],
},
},
}
// libadbd_core contains the common sources to build libadbd and libadbd_services.
cc_library_static {
name: "libadbd_core",
defaults: ["adb_defaults"],
recovery_available: true,
// libminadbd wants both, as it's used to build native tests.
compile_multilib: "both",
srcs: libadb_srcs + libadb_posix_srcs + [
"daemon/auth.cpp",
"daemon/jdwp_service.cpp",
"daemon/usb.cpp",
"daemon/usb_ffs.cpp",
"daemon/usb_legacy.cpp",
],
local_include_dirs: [
"daemon/include",
],
generated_headers: ["platform_tools_version"],
static_libs: [
"libdiagnose_usb",
"libqemu_pipe",
],
shared_libs: [
"libasyncio",
"libbase",
"libcrypto",
"libcrypto_utils",
"libcutils",
"liblog",
],
}
cc_library {
name: "libadbd_services",
defaults: ["adb_defaults"],
recovery_available: true,
compile_multilib: "both",
srcs: [
"daemon/file_sync_service.cpp",
"daemon/framebuffer_service.cpp",
"daemon/mdns.cpp",
"daemon/remount_service.cpp",
"daemon/services.cpp",
"daemon/set_verity_enable_state_service.cpp",
"daemon/shell_service.cpp",
"shell_service_protocol.cpp",
],
cflags: [
"-D_GNU_SOURCE",
"-Wno-deprecated-declarations",
],
static_libs: [
"libadbd_core",
"libavb_user",
"libdiagnose_usb",
"libqemu_pipe",
],
shared_libs: [
"libasyncio",
"libbase",
"libbootloader_message",
"libcrypto",
"libcrypto_utils",
"libcutils",
"libext4_utils",
"libfec",
"libfs_mgr",
"liblog",
"libmdnssd",
"libselinux",
],
}
cc_library {
name: "libadbd",
defaults: ["adb_defaults"],
recovery_available: true,
// Avoid getting duplicate symbol of android::build::GetBuildNumber().
use_version_lib: false,
// libminadbd wants both, as it's used to build native tests.
compile_multilib: "both",
// libadbd doesn't build any additional source, but to expose libadbd_core as a shared library.
whole_static_libs: [
"libadbd_core",
],
shared_libs: [
"libadbd_services",
"libasyncio",
"libbase",
"libcrypto",
"libcrypto_utils",
"libcutils",
"liblog",
],
export_include_dirs: [
"daemon/include",
],
}
cc_binary {
name: "adbd",
defaults: ["adb_defaults"],
recovery_available: true,
srcs: [
"daemon/main.cpp",
],
cflags: [
"-D_GNU_SOURCE",
"-Wno-deprecated-declarations",
],
strip: {
keep_symbols: true,
},
shared_libs: [
"libadbd",
"libadbd_services",
"libbase",
"libcap",
"libcrypto",
"libcutils",
"liblog",
"libminijail",
"libselinux",
],
}
cc_test {
name: "adbd_test",
defaults: ["adb_defaults"],
srcs: libadb_test_srcs + [
"daemon/services.cpp",
"daemon/shell_service.cpp",
"daemon/shell_service_test.cpp",
"shell_service_protocol.cpp",
"shell_service_protocol_test.cpp",
],
static_libs: [
"libadbd",
"libbase",
"libbootloader_message",
"libcutils",
"libcrypto_utils",
"libcrypto",
"libdiagnose_usb",
"liblog",
"libusb",
"libmdnssd",
"libselinux",
],
test_suites: ["device-tests"],
}
python_test_host {
name: "adb_integration_test_adb",
main: "test_adb.py",
srcs: [
"test_adb.py",
],
test_config: "adb_integration_test_adb.xml",
test_suites: ["general-tests"],
version: {
py2: {
enabled: false,
},
py3: {
enabled: true,
},
},
}
python_test_host {
name: "adb_integration_test_device",
main: "test_device.py",
srcs: [
"test_device.py",
],
libs: [
"adb_py",
],
test_config: "adb_integration_test_device.xml",
test_suites: ["general-tests"],
version: {
py2: {
enabled: true,
},
py3: {
enabled: false,
},
},
}
Reference in a new issue View git blame Copy permalink