Fix references to system/core.

Test: treehugger
Change-Id: Iea04e15d1bf266cc6da495b554ba0dfd8d125641

9 files changed, 3 insertions, 15 deletions

diff --git a/Android.bp b/Android.bp
index c361a14b..43d3b766 100644
--- a/Android.bp
+++ b/Android.bp
@@ -295,7 +295,6 @@ cc_library {
     visibility: [
         "//bootable/recovery/minadbd:__subpackages__",
         "//packages/modules/adb:__subpackages__",
-        "//system/core/adb:__subpackages__",
     ],
 
     apex_available: [
@@ -501,7 +500,6 @@ cc_library_static {
     visibility: [
         "//bootable/recovery/minadbd",
         "//packages/modules/adb:__subpackages__",
-        "//system/core/adb",
     ],
 }
 
@@ -581,7 +579,6 @@ cc_library {
     ],
     visibility: [
         "//packages/modules/adb",
-        "//system/core/adb",
     ],
 
 }
@@ -640,7 +637,6 @@ cc_library {
     visibility: [
         "//bootable/recovery/minadbd",
         "//packages/modules/adb",
-        "//system/core/adb",
     ],
 }
 
diff --git a/coverage/report.sh b/coverage/report.sh
index 257310c6..335d3a7a 100755
--- a/coverage/report.sh
+++ b/coverage/report.sh
@@ -10,13 +10,13 @@ rm -rf "$OUTPUT_DIR"/report
 cd $ANDROID_BUILD_TOP
 llvm-cov show --instr-profile="$OUTPUT_DIR"/adbd.profdata \
   $ANDROID_PRODUCT_OUT/apex/com.android.adbd/bin/adbd \
-  /proc/self/cwd/system/core/adb \
+  /proc/self/cwd/packages/modules/adb \
   $ADB_TEST_BINARIES \
   --show-region-summary=false \
   --format=html -o "$OUTPUT_DIR"/report
 
 llvm-cov report --instr-profile="$OUTPUT_DIR"/adbd.profdata \
   $ANDROID_PRODUCT_OUT/apex/com.android.adbd/bin/adbd \
-  /proc/self/cwd/system/core/adb \
+  /proc/self/cwd/packages/modules/adb \
   $ADB_TEST_BINARIES \
   --show-region-summary=false
diff --git a/coverage/show.sh b/coverage/show.sh
index 3b2faa30..9435e196 100755
--- a/coverage/show.sh
+++ b/coverage/show.sh
@@ -5,7 +5,7 @@ set -euxo pipefail
 OUTPUT_DIR=$(realpath $(dirname "$0"))
 . "$OUTPUT_DIR"/include.sh
 
-BASE_PATH=/proc/self/cwd/system/core/adb
+BASE_PATH=/proc/self/cwd/packages/modules/adb
 PATHS=""
 if [[ $# == 0 ]]; then
   PATHS=$BASE_PATH
diff --git a/crypto/Android.bp b/crypto/Android.bp
index c4052c39..1ff76dce 100644
--- a/crypto/Android.bp
+++ b/crypto/Android.bp
@@ -41,7 +41,6 @@ cc_defaults {
     visibility: [
         "//bootable/recovery/minadbd:__subpackages__",
         "//packages/modules/adb:__subpackages__",
-        "//system/core/adb:__subpackages__",
     ],
 
     host_supported: true,
diff --git a/libs/adbconnection/Android.bp b/libs/adbconnection/Android.bp
index 29ae060d..0c012178 100644
--- a/libs/adbconnection/Android.bp
+++ b/libs/adbconnection/Android.bp
@@ -40,7 +40,6 @@ cc_library {
     visibility: [
         "//art:__subpackages__",
         "//packages/modules/adb/apex:__subpackages__",
-        "//system/core/adb/apex:__subpackages__",
     ],
     apex_available: [
         "com.android.adbd",
diff --git a/pairing_auth/Android.bp b/pairing_auth/Android.bp
index 806879dd..9785ee23 100644
--- a/pairing_auth/Android.bp
+++ b/pairing_auth/Android.bp
@@ -41,7 +41,6 @@ cc_defaults {
     visibility: [
         "//art:__subpackages__",
         "//packages/modules/adb:__subpackages__",
-        "//system/core/adb:__subpackages__",
     ],
 
     // libadb_pairing_auth doesn't need an embedded build number.
diff --git a/pairing_connection/Android.bp b/pairing_connection/Android.bp
index 18868859..0cfb7c0f 100644
--- a/pairing_connection/Android.bp
+++ b/pairing_connection/Android.bp
@@ -41,7 +41,6 @@ cc_defaults {
         "//art:__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__",
@@ -132,7 +131,6 @@ cc_defaults {
         "//art:__subpackages__",
         "//frameworks/base/services:__subpackages__",
         "//packages/modules/adb:__subpackages__",
-        "//system/core/adb:__subpackages__",
     ],
 
     recovery_available: false,
diff --git a/proto/Android.bp b/proto/Android.bp
index ef97208a..b7eaa48a 100644
--- a/proto/Android.bp
+++ b/proto/Android.bp
@@ -41,7 +41,6 @@ cc_defaults {
 
     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.
         "//bootable/recovery/minadbd:__subpackages__",
@@ -96,7 +95,6 @@ cc_defaults {
 
     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.
         "//bootable/recovery/minadbd:__subpackages__",
diff --git a/tls/Android.bp b/tls/Android.bp
index 1e005480..eee59846 100644
--- a/tls/Android.bp
+++ b/tls/Android.bp
@@ -41,7 +41,6 @@ cc_defaults {
     visibility: [
         "//bootable/recovery/minadbd:__subpackages__",
         "//packages/modules/adb:__subpackages__",
-        "//system/core/adb:__subpackages__",
     ],
 
     shared_libs: [