Merge "Migrate system/core/adb to packages/modules/adb"
This commit is contained in:
commit
4fdc6f1328
7 changed files with 16 additions and 4 deletions
|
|
@ -293,8 +293,9 @@ cc_library {
|
||||||
export_include_dirs: ["."],
|
export_include_dirs: ["."],
|
||||||
|
|
||||||
visibility: [
|
visibility: [
|
||||||
"//system/core/adb:__subpackages__",
|
|
||||||
"//bootable/recovery/minadbd:__subpackages__",
|
"//bootable/recovery/minadbd:__subpackages__",
|
||||||
|
"//packages/modules/adb:__subpackages__",
|
||||||
|
"//system/core/adb:__subpackages__",
|
||||||
],
|
],
|
||||||
|
|
||||||
apex_available: [
|
apex_available: [
|
||||||
|
|
@ -499,6 +500,7 @@ cc_library_static {
|
||||||
],
|
],
|
||||||
visibility: [
|
visibility: [
|
||||||
"//bootable/recovery/minadbd",
|
"//bootable/recovery/minadbd",
|
||||||
|
"//packages/modules/adb:__subpackages__",
|
||||||
"//system/core/adb",
|
"//system/core/adb",
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
|
@ -578,6 +580,7 @@ cc_library {
|
||||||
"com.android.adbd",
|
"com.android.adbd",
|
||||||
],
|
],
|
||||||
visibility: [
|
visibility: [
|
||||||
|
"//packages/modules/adb",
|
||||||
"//system/core/adb",
|
"//system/core/adb",
|
||||||
],
|
],
|
||||||
|
|
||||||
|
|
@ -636,6 +639,7 @@ cc_library {
|
||||||
|
|
||||||
visibility: [
|
visibility: [
|
||||||
"//bootable/recovery/minadbd",
|
"//bootable/recovery/minadbd",
|
||||||
|
"//packages/modules/adb",
|
||||||
"//system/core/adb",
|
"//system/core/adb",
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -39,8 +39,9 @@ cc_defaults {
|
||||||
export_include_dirs: ["include"],
|
export_include_dirs: ["include"],
|
||||||
|
|
||||||
visibility: [
|
visibility: [
|
||||||
"//system/core/adb:__subpackages__",
|
|
||||||
"//bootable/recovery/minadbd:__subpackages__",
|
"//bootable/recovery/minadbd:__subpackages__",
|
||||||
|
"//packages/modules/adb:__subpackages__",
|
||||||
|
"//system/core/adb:__subpackages__",
|
||||||
],
|
],
|
||||||
|
|
||||||
host_supported: true,
|
host_supported: true,
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,7 @@ cc_library {
|
||||||
defaults: ["adbd_defaults"],
|
defaults: ["adbd_defaults"],
|
||||||
visibility: [
|
visibility: [
|
||||||
"//art:__subpackages__",
|
"//art:__subpackages__",
|
||||||
|
"//packages/modules/adb/apex:__subpackages__",
|
||||||
"//system/core/adb/apex:__subpackages__",
|
"//system/core/adb/apex:__subpackages__",
|
||||||
],
|
],
|
||||||
apex_available: [
|
apex_available: [
|
||||||
|
|
|
||||||
|
|
@ -40,6 +40,7 @@ cc_defaults {
|
||||||
|
|
||||||
visibility: [
|
visibility: [
|
||||||
"//art:__subpackages__",
|
"//art:__subpackages__",
|
||||||
|
"//packages/modules/adb:__subpackages__",
|
||||||
"//system/core/adb:__subpackages__",
|
"//system/core/adb:__subpackages__",
|
||||||
],
|
],
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -39,8 +39,9 @@ cc_defaults {
|
||||||
|
|
||||||
visibility: [
|
visibility: [
|
||||||
"//art:__subpackages__",
|
"//art:__subpackages__",
|
||||||
"//system/core/adb:__subpackages__",
|
|
||||||
"//frameworks/base/services:__subpackages__",
|
"//frameworks/base/services:__subpackages__",
|
||||||
|
"//packages/modules/adb:__subpackages__",
|
||||||
|
"//system/core/adb:__subpackages__",
|
||||||
|
|
||||||
// This needs to be visible to minadbd, even though it's removed via exclude_shared_libs.
|
// This needs to be visible to minadbd, even though it's removed via exclude_shared_libs.
|
||||||
"//bootable/recovery/minadbd:__subpackages__",
|
"//bootable/recovery/minadbd:__subpackages__",
|
||||||
|
|
@ -129,8 +130,9 @@ cc_defaults {
|
||||||
|
|
||||||
visibility: [
|
visibility: [
|
||||||
"//art:__subpackages__",
|
"//art:__subpackages__",
|
||||||
"//system/core/adb:__subpackages__",
|
|
||||||
"//frameworks/base/services:__subpackages__",
|
"//frameworks/base/services:__subpackages__",
|
||||||
|
"//packages/modules/adb:__subpackages__",
|
||||||
|
"//system/core/adb:__subpackages__",
|
||||||
],
|
],
|
||||||
|
|
||||||
recovery_available: false,
|
recovery_available: false,
|
||||||
|
|
|
||||||
|
|
@ -40,6 +40,7 @@ cc_defaults {
|
||||||
},
|
},
|
||||||
|
|
||||||
visibility: [
|
visibility: [
|
||||||
|
"//packages/modules/adb:__subpackages__",
|
||||||
"//system/core/adb:__subpackages__",
|
"//system/core/adb:__subpackages__",
|
||||||
|
|
||||||
// This needs to be visible to minadbd, even though it's removed via exclude_shared_libs.
|
// This needs to be visible to minadbd, even though it's removed via exclude_shared_libs.
|
||||||
|
|
@ -94,6 +95,7 @@ cc_defaults {
|
||||||
},
|
},
|
||||||
|
|
||||||
visibility: [
|
visibility: [
|
||||||
|
"//packages/modules/adb:__subpackages__",
|
||||||
"//system/core/adb:__subpackages__",
|
"//system/core/adb:__subpackages__",
|
||||||
|
|
||||||
// This needs to be visible to minadbd, even though it's removed via exclude_shared_libs.
|
// This needs to be visible to minadbd, even though it's removed via exclude_shared_libs.
|
||||||
|
|
|
||||||
|
|
@ -40,6 +40,7 @@ cc_defaults {
|
||||||
|
|
||||||
visibility: [
|
visibility: [
|
||||||
"//bootable/recovery/minadbd:__subpackages__",
|
"//bootable/recovery/minadbd:__subpackages__",
|
||||||
|
"//packages/modules/adb:__subpackages__",
|
||||||
"//system/core/adb:__subpackages__",
|
"//system/core/adb:__subpackages__",
|
||||||
],
|
],
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue