Merge "Migrate system/core/adb to packages/modules/adb"
diff --git a/adb/Android.bp b/adb/Android.bp
index 5c1e1fe..c361a14 100644
--- a/adb/Android.bp
+++ b/adb/Android.bp
@@ -293,8 +293,9 @@
export_include_dirs: ["."],
visibility: [
- "//system/core/adb:__subpackages__",
"//bootable/recovery/minadbd:__subpackages__",
+ "//packages/modules/adb:__subpackages__",
+ "//system/core/adb:__subpackages__",
],
apex_available: [
@@ -499,6 +500,7 @@
],
visibility: [
"//bootable/recovery/minadbd",
+ "//packages/modules/adb:__subpackages__",
"//system/core/adb",
],
}
@@ -578,6 +580,7 @@
"com.android.adbd",
],
visibility: [
+ "//packages/modules/adb",
"//system/core/adb",
],
@@ -636,6 +639,7 @@
visibility: [
"//bootable/recovery/minadbd",
+ "//packages/modules/adb",
"//system/core/adb",
],
}
diff --git a/adb/crypto/Android.bp b/adb/crypto/Android.bp
index e2c27f1..c4052c3 100644
--- a/adb/crypto/Android.bp
+++ b/adb/crypto/Android.bp
@@ -39,8 +39,9 @@
export_include_dirs: ["include"],
visibility: [
- "//system/core/adb:__subpackages__",
"//bootable/recovery/minadbd:__subpackages__",
+ "//packages/modules/adb:__subpackages__",
+ "//system/core/adb:__subpackages__",
],
host_supported: true,
diff --git a/adb/libs/adbconnection/Android.bp b/adb/libs/adbconnection/Android.bp
index f7d2dc1..29ae060 100644
--- a/adb/libs/adbconnection/Android.bp
+++ b/adb/libs/adbconnection/Android.bp
@@ -39,6 +39,7 @@
defaults: ["adbd_defaults"],
visibility: [
"//art:__subpackages__",
+ "//packages/modules/adb/apex:__subpackages__",
"//system/core/adb/apex:__subpackages__",
],
apex_available: [
diff --git a/adb/pairing_auth/Android.bp b/adb/pairing_auth/Android.bp
index a43f4d0..806879d 100644
--- a/adb/pairing_auth/Android.bp
+++ b/adb/pairing_auth/Android.bp
@@ -40,6 +40,7 @@
visibility: [
"//art:__subpackages__",
+ "//packages/modules/adb:__subpackages__",
"//system/core/adb:__subpackages__",
],
diff --git a/adb/pairing_connection/Android.bp b/adb/pairing_connection/Android.bp
index 9595511..1886885 100644
--- a/adb/pairing_connection/Android.bp
+++ b/adb/pairing_connection/Android.bp
@@ -39,8 +39,9 @@
visibility: [
"//art:__subpackages__",
- "//system/core/adb:__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.
"//bootable/recovery/minadbd:__subpackages__",
@@ -129,8 +130,9 @@
visibility: [
"//art:__subpackages__",
- "//system/core/adb:__subpackages__",
"//frameworks/base/services:__subpackages__",
+ "//packages/modules/adb:__subpackages__",
+ "//system/core/adb:__subpackages__",
],
recovery_available: false,
diff --git a/adb/proto/Android.bp b/adb/proto/Android.bp
index 086d10e..ef97208 100644
--- a/adb/proto/Android.bp
+++ b/adb/proto/Android.bp
@@ -40,6 +40,7 @@
},
visibility: [
+ "//packages/modules/adb:__subpackages__",
"//system/core/adb:__subpackages__",
// This needs to be visible to minadbd, even though it's removed via exclude_shared_libs.
@@ -94,6 +95,7 @@
},
visibility: [
+ "//packages/modules/adb:__subpackages__",
"//system/core/adb:__subpackages__",
// This needs to be visible to minadbd, even though it's removed via exclude_shared_libs.
diff --git a/adb/tls/Android.bp b/adb/tls/Android.bp
index e5204f3..1e00548 100644
--- a/adb/tls/Android.bp
+++ b/adb/tls/Android.bp
@@ -40,6 +40,7 @@
visibility: [
"//bootable/recovery/minadbd:__subpackages__",
+ "//packages/modules/adb:__subpackages__",
"//system/core/adb:__subpackages__",
],