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

Merge "Add libadbd_auth to adbd's required list."

Browse source
This commit is contained in:
Josh Gao 2020-02-04 10:16:41 +00:00 committed by Gerrit Code Review
commit 955601beb4
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
adb/Android.bp
View file

@ -29,7 +29,6 @@ cc_defaults {
"-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION=1",
],
cpp_std: "experimental",
stl: "libc++_static",
use_version_lib: true,
compile_multilib: "first",
@ -325,6 +324,7 @@ cc_benchmark {
cc_binary_host {
name: "adb",
stl: "libc++_static",
defaults: ["adb_defaults"],
srcs: [
@ -542,6 +542,7 @@ cc_library {
cc_binary {
name: "adbd",
defaults: ["adbd_defaults", "host_adbd_supported"],
stl: "libc++_static",
recovery_available: true,
srcs: [
@ -577,6 +578,8 @@ cc_binary {
"libadbd_auth",
"libcrypto",
],
required: ["libadbd_auth"],
}
phony {
@ -599,6 +602,7 @@ cc_binary {
name: "abb",
defaults: ["adbd_defaults"],
stl: "libc++",
recovery_available: false,
srcs: [
@ -631,7 +635,11 @@ cc_binary {
cc_test {
name: "adbd_test",
defaults: ["adbd_defaults"],
stl: "libc++_static",
recovery_available: false,
srcs: libadb_test_srcs + [
"daemon/services.cpp",
"daemon/shell_service.cpp",