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

Merge "Add libadbd_auth to adbd's required list." am: 955601beb4 am: 4a0bbf0838

Browse source 
Change-Id: Ibf2de419604d7041b0ddfeb5a5addb5deff6cd59
This commit is contained in:
Automerger Merge Worker 2020-02-04 10:38:53 +00:00
commit 023d78872b
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", "-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION=1",
], ],
cpp_std: "experimental", cpp_std: "experimental",
stl: "libc++_static",
use_version_lib: true, use_version_lib: true,
compile_multilib: "first", compile_multilib: "first",
@ -325,6 +324,7 @@ cc_benchmark {
cc_binary_host { cc_binary_host {
name: "adb", name: "adb",
stl: "libc++_static",
defaults: ["adb_defaults"], defaults: ["adb_defaults"],
srcs: [ srcs: [
@ -542,6 +542,7 @@ cc_library {
cc_binary { cc_binary {
name: "adbd", name: "adbd",
defaults: ["adbd_defaults", "host_adbd_supported"], defaults: ["adbd_defaults", "host_adbd_supported"],
stl: "libc++_static",
recovery_available: true, recovery_available: true,
srcs: [ srcs: [
@ -577,6 +578,8 @@ cc_binary {
"libadbd_auth", "libadbd_auth",
"libcrypto", "libcrypto",
], ],
required: ["libadbd_auth"],
} }
phony { phony {
@ -599,6 +602,7 @@ cc_binary {
name: "abb", name: "abb",
defaults: ["adbd_defaults"], defaults: ["adbd_defaults"],
stl: "libc++",
recovery_available: false, recovery_available: false,
srcs: [ srcs: [
@ -631,7 +635,11 @@ cc_binary {
cc_test { cc_test {
name: "adbd_test", name: "adbd_test",
defaults: ["adbd_defaults"], defaults: ["adbd_defaults"],
stl: "libc++_static",
recovery_available: false,
srcs: libadb_test_srcs + [ srcs: libadb_test_srcs + [
"daemon/services.cpp", "daemon/services.cpp",
"daemon/shell_service.cpp", "daemon/shell_service.cpp",