Internal

PiperOrigin-RevId: 769678809

Author: brettchabot

core/java/androidx/test/core/BUILD

@@ -36,15 +36,14 @@ android_library(
 )
 
 kt_android_library(
-    name = "core_internal",
+    name = "core",
     srcs = glob(
         [
             "**/*.java",
             "**/*.kt",
         ],
     ),
     tags = ["alt_dep=//core"],
-    visibility = ["//visibility:private"],
     deps = [
         ":manifest",
         "//opensource/androidx:annotation",
@@ -57,26 +56,14 @@ kt_android_library(
     ],
 )
 
-# TODO(b/199522848): delete these targets once espresso moves to testonly
-android_library(
-    name = "core",
-    exports = [":core_internal"],
-)
-
-android_library(
-    name = "core_not_test_only",
-    visibility = ["//espresso/core/java/androidx/test/espresso:__subpackages__"],
-    exports = [":core_internal"],
-)
-
 # kt_android_library does not produce an aar, so wrap in a android_library for release
 android_library(
     name = "core_aar_lib",
     manifest = "AndroidManifest.xml",
     resource_files = glob(["res/**"]),
     visibility = ["//visibility:private"],
     exports = [
-        ":core_internal",
+        ":core",
     ],
 )
 

espresso/core/java/androidx/test/espresso/action/BUILD

@@ -44,7 +44,7 @@ kt_android_library(
     javacopts = COMMON_JAVACOPTS,
     deps = [
         ":adapter_view_protocol",
-        "//core/java/androidx/test/core:core_not_test_only",
+        "//core",
         "//espresso/core/java/androidx/test/espresso:framework",
         "//espresso/core/java/androidx/test/espresso:interface",
         "//espresso/core/java/androidx/test/espresso/matcher",

espresso/core/java/androidx/test/espresso/base/BUILD

@@ -99,7 +99,7 @@ android_library(
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "//core/java/androidx/test/core:core_not_test_only",
+        "//core",
         "//espresso/core/java/androidx/test/espresso:interface",
         "//espresso/core/java/androidx/test/espresso/internal/inject",
         "//espresso/core/java/androidx/test/espresso/util",