diff --git a/BUILD b/BUILD
index c0fcbeb46ac..f7aa9cc7810 100644
--- a/BUILD
+++ b/BUILD
@@ -58,7 +58,7 @@ java_library(
 
 android_library(
     name = "android",
-    exported_plugins = ["//java/dagger/android/processor:plugin"],
+    exported_plugins = ["//dagger-android-processor:plugin"],
     exports = ["//java/dagger/android"],
 )
 
diff --git a/dagger-android-processor/BUILD b/dagger-android-processor/BUILD
new file mode 100644
index 00000000000..cd3310a8e5a
--- /dev/null
+++ b/dagger-android-processor/BUILD
@@ -0,0 +1,76 @@
+# Copyright (C) 2017 The Dagger Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Description:
+#   Public Dagger API for Android
+
+load("//:build_defs.bzl", "POM_VERSION")
+load("//tools/maven:maven.bzl", "gen_maven_artifact")
+
+package(default_visibility = ["//:src"])
+
+package_group(
+    name = "internal",
+    packages = [
+        "//dagger-android-processor/...",
+        "//javatests/dagger/android/processor/...",
+    ],
+)
+
+gen_maven_artifact(
+    name = "artifact",
+    artifact_coordinates = "com.google.dagger:dagger-android-processor:" + POM_VERSION,
+    artifact_name = "Dagger Android Processor",
+    artifact_target = "//dagger-android-processor/main/java/dagger/android/processor",
+    artifact_target_libs = [
+        "//java/dagger/internal/codegen/xprocessing",
+        "//dagger-android-processor/main/java/dagger/android/processor:base_processing_step",
+    ],
+    artifact_target_maven_deps = [
+        "com.google.dagger:dagger",
+        "com.google.devtools.ksp:symbol-processing-api",
+        "com.google.guava:guava",
+        "com.squareup:javapoet",
+        "com.google.code.findbugs:jsr305",
+        "com.google.dagger:dagger-spi",
+        "com.google.guava:failureaccess",
+        "com.squareup:kotlinpoet",
+        "com.squareup:kotlinpoet-javapoet",
+        "net.ltgt.gradle.incap:incap",
+        "org.jetbrains.kotlin:kotlin-stdlib",
+    ],
+    javadoc_root_packages = [
+        "dagger.android.processor",
+    ],
+    javadoc_srcs = [
+        "//dagger-android-processor/main/java/dagger/android/processor:srcs",
+    ],
+)
+
+# Note: We're exposing this to the proguard processor, which is not actually used by any artifact.
+alias(
+    name = "base_processing_step",
+    actual = "//dagger-android-processor/main/java/dagger/android/processor:base_processing_step",
+    visibility = [
+        "//java/dagger/android/internal/proguard:__pkg__",
+    ],
+)
+
+alias(
+    name = "plugin",
+    actual = "//dagger-android-processor/main/java/dagger/android/processor:plugin",
+    visibility = [
+        "//:__pkg__",
+    ],
+)
diff --git a/java/dagger/android/processor/AndroidInjectorDescriptor.java b/dagger-android-processor/main/java/dagger/android/processor/AndroidInjectorDescriptor.java
similarity index 100%
rename from java/dagger/android/processor/AndroidInjectorDescriptor.java
rename to dagger-android-processor/main/java/dagger/android/processor/AndroidInjectorDescriptor.java
diff --git a/java/dagger/android/processor/AndroidMapKeyProcessingStep.java b/dagger-android-processor/main/java/dagger/android/processor/AndroidMapKeyProcessingStep.java
similarity index 100%
rename from java/dagger/android/processor/AndroidMapKeyProcessingStep.java
rename to dagger-android-processor/main/java/dagger/android/processor/AndroidMapKeyProcessingStep.java
diff --git a/java/dagger/android/processor/AndroidMapKeys.java b/dagger-android-processor/main/java/dagger/android/processor/AndroidMapKeys.java
similarity index 100%
rename from java/dagger/android/processor/AndroidMapKeys.java
rename to dagger-android-processor/main/java/dagger/android/processor/AndroidMapKeys.java
diff --git a/java/dagger/android/processor/AndroidProcessor.java b/dagger-android-processor/main/java/dagger/android/processor/AndroidProcessor.java
similarity index 100%
rename from java/dagger/android/processor/AndroidProcessor.java
rename to dagger-android-processor/main/java/dagger/android/processor/AndroidProcessor.java
diff --git a/java/dagger/android/processor/BUILD b/dagger-android-processor/main/java/dagger/android/processor/BUILD
similarity index 66%
rename from java/dagger/android/processor/BUILD
rename to dagger-android-processor/main/java/dagger/android/processor/BUILD
index c28529f8b8c..30b85d3faf1 100644
--- a/java/dagger/android/processor/BUILD
+++ b/dagger-android-processor/main/java/dagger/android/processor/BUILD
@@ -22,9 +22,10 @@ load(
     "DOCLINT_REFERENCES",
     "POM_VERSION",
 )
-load("//tools/maven:maven.bzl", "gen_maven_artifact")
 
-package(default_visibility = ["//:src"])
+package(default_visibility = [
+    "//dagger-android-processor:internal",
+])
 
 filegroup(
     name = "srcs",
@@ -66,34 +67,6 @@ java_library(
     ],
 )
 
-gen_maven_artifact(
-    name = "artifact",
-    artifact_coordinates = "com.google.dagger:dagger-android-processor:" + POM_VERSION,
-    artifact_name = "Dagger Android Processor",
-    artifact_target = ":processor",
-    artifact_target_libs = [
-        "//java/dagger/internal/codegen/xprocessing",
-        "//java/dagger/android/processor:base_processing_step",
-    ],
-    artifact_target_maven_deps = [
-        "com.google.dagger:dagger",
-        "com.google.devtools.ksp:symbol-processing-api",
-        "com.google.guava:guava",
-        "com.squareup:javapoet",
-        "com.google.code.findbugs:jsr305",
-        "com.google.dagger:dagger-spi",
-        "com.google.guava:failureaccess",
-        "com.squareup:kotlinpoet",
-        "com.squareup:kotlinpoet-javapoet",
-        "net.ltgt.gradle.incap:incap",
-        "org.jetbrains.kotlin:kotlin-stdlib",
-    ],
-    javadoc_root_packages = [
-        "dagger.android.processor",
-    ],
-    javadoc_srcs = [":srcs"],
-)
-
 java_plugin(
     name = "plugin",
     generates_api = 1,
diff --git a/java/dagger/android/processor/BaseProcessingStep.java b/dagger-android-processor/main/java/dagger/android/processor/BaseProcessingStep.java
similarity index 100%
rename from java/dagger/android/processor/BaseProcessingStep.java
rename to dagger-android-processor/main/java/dagger/android/processor/BaseProcessingStep.java
diff --git a/java/dagger/android/processor/ContributesAndroidInjectorProcessingStep.java b/dagger-android-processor/main/java/dagger/android/processor/ContributesAndroidInjectorProcessingStep.java
similarity index 100%
rename from java/dagger/android/processor/ContributesAndroidInjectorProcessingStep.java
rename to dagger-android-processor/main/java/dagger/android/processor/ContributesAndroidInjectorProcessingStep.java
diff --git a/java/dagger/android/processor/DelegateAndroidProcessor.java b/dagger-android-processor/main/java/dagger/android/processor/DelegateAndroidProcessor.java
similarity index 100%
rename from java/dagger/android/processor/DelegateAndroidProcessor.java
rename to dagger-android-processor/main/java/dagger/android/processor/DelegateAndroidProcessor.java
diff --git a/java/dagger/android/processor/DuplicateAndroidInjectorsChecker.java b/dagger-android-processor/main/java/dagger/android/processor/DuplicateAndroidInjectorsChecker.java
similarity index 100%
rename from java/dagger/android/processor/DuplicateAndroidInjectorsChecker.java
rename to dagger-android-processor/main/java/dagger/android/processor/DuplicateAndroidInjectorsChecker.java
diff --git a/java/dagger/android/processor/KspAndroidProcessor.java b/dagger-android-processor/main/java/dagger/android/processor/KspAndroidProcessor.java
similarity index 100%
rename from java/dagger/android/processor/KspAndroidProcessor.java
rename to dagger-android-processor/main/java/dagger/android/processor/KspAndroidProcessor.java
diff --git a/java/dagger/android/processor/XTypeNames.java b/dagger-android-processor/main/java/dagger/android/processor/XTypeNames.java
similarity index 100%
rename from java/dagger/android/processor/XTypeNames.java
rename to dagger-android-processor/main/java/dagger/android/processor/XTypeNames.java
diff --git a/java/dagger/android/internal/proguard/BUILD b/java/dagger/android/internal/proguard/BUILD
index 7cb2cbc5d38..9463eaf3be8 100644
--- a/java/dagger/android/internal/proguard/BUILD
+++ b/java/dagger/android/internal/proguard/BUILD
@@ -29,7 +29,7 @@ java_library(
     ],
     javacopts = DOCLINT_HTML_AND_SYNTAX + DOCLINT_REFERENCES,
     deps = [
-        "//java/dagger/android/processor:base_processing_step",
+        "//dagger-android-processor:base_processing_step",
         "//java/dagger/internal/codegen/xprocessing",
         "//third_party/java/auto:service",
         "//third_party/java/guava/collect",
diff --git a/javatests/dagger/android/processor/BUILD b/javatests/dagger/android/processor/BUILD
index ddf930bf20f..d2d6054a44a 100644
--- a/javatests/dagger/android/processor/BUILD
+++ b/javatests/dagger/android/processor/BUILD
@@ -27,8 +27,8 @@ GenJavaTests(
     javacopts = DOCLINT_HTML_AND_SYNTAX,
     deps = [
         "//:dagger_with_compiler",
+        "//dagger-android-processor/main/java/dagger/android/processor",
         "//java/dagger/android",
-        "//java/dagger/android/processor",
         "//java/dagger/internal/codegen:processor",
         "//java/dagger/testing/compile",
         "//third_party/java/compile_testing",
diff --git a/util/deploy-dagger.sh b/util/deploy-dagger.sh
index fdc88d285c9..386a1a94575 100755
--- a/util/deploy-dagger.sh
+++ b/util/deploy-dagger.sh
@@ -109,10 +109,10 @@ _deploy \
 
 _deploy \
   "com.google.auto.common,dagger.spi.internal.shaded.auto.common;androidx.room.compiler,dagger.spi.internal.shaded.androidx.room.compiler;kotlin.metadata,dagger.spi.internal.shaded.kotlin.metadata;androidx.room,dagger.spi.internal.shaded.androidx.room" \
-  java/dagger/android/processor/artifact.jar \
-  java/dagger/android/processor/pom.xml \
-  java/dagger/android/processor/artifact-src.jar \
-  java/dagger/android/processor/artifact-javadoc.jar \
+  dagger-android-processor/artifact.jar \
+  dagger-android-processor/pom.xml \
+  dagger-android-processor/artifact-src.jar \
+  dagger-android-processor/artifact-javadoc.jar \
   ""
 
 _deploy \