Merge "Revert "Merge commit 'upstream/dagger-2.35.1^'"" am: 5882ce8935 am: 5480a6c05f

Original change: https://android-review.googlesource.com/c/platform/external/dagger2/+/1705751

Change-Id: I2f7a4d61b9f48965273925620a8dc0afc43c9bef

1 files changed, 6 insertions, 27 deletions

diff --git a/java/dagger/hilt/processor/internal/root/Root.java b/java/dagger/hilt/processor/internal/root/Root.java
index 24440b0c9..981636d62 100644
--- a/java/dagger/hilt/processor/internal/root/Root.java
+++ b/java/dagger/hilt/processor/internal/root/Root.java
@@ -19,7 +19,6 @@ package dagger.hilt.processor.internal.root;
 import com.google.auto.common.MoreElements;
 import com.google.auto.value.AutoValue;
 import com.squareup.javapoet.ClassName;
-import dagger.hilt.processor.internal.ClassNames;
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
@@ -27,37 +26,18 @@ import javax.lang.model.element.TypeElement;
 /** Metadata for a root element that can trigger the {@link RootProcessor}. */
 @AutoValue
 abstract class Root {
-  /**
-   * Creates the default root for this (test) build compilation.
-   *
-   * <p>A default root installs only the global {@code InstallIn} and {@code TestInstallIn}
-   * dependencies. Test-specific dependencies are not installed in the default root.
-   *
-   * <p>The default root is used for two purposes:
-   *
-   * <ul>
-   *   <li>To inject {@code EarlyEntryPoint} annotated interfaces.
-   *   <li>To inject tests that only depend on global dependencies
-   * </ul>
-   */
-  static Root createDefaultRoot(ProcessingEnvironment env) {
-    TypeElement rootElement =
-        env.getElementUtils().getTypeElement(ClassNames.DEFAULT_ROOT.canonicalName());
-    return new AutoValue_Root(rootElement, /*isTestRoot=*/ true);
-  }
-
   /** Creates a {@plainlink Root root} for the given {@plainlink Element element}. */
   static Root create(Element element, ProcessingEnvironment env) {
     TypeElement rootElement = MoreElements.asType(element);
-    return new AutoValue_Root(rootElement, RootType.of(rootElement).isTestRoot());
+    return new AutoValue_Root(RootType.of(env, rootElement), rootElement);
   }
 
+  /** Returns the type of the root {@code element}. */
+  abstract RootType type();
+
   /** Returns the root element that should be used with processing. */
   abstract TypeElement element();
 
-  /** Returns {@code true} if this is a test root. */
-  abstract boolean isTestRoot();
-
   /** Returns the class name of the root element. */
   ClassName classname() {
     return ClassName.get(element());
@@ -68,8 +48,7 @@ abstract class Root {
     return element().toString();
   }
 
-  /** Returns {@code true} if this uses the default root. */
-  boolean isDefaultRoot() {
-    return classname().equals(ClassNames.DEFAULT_ROOT);
+  boolean isTestRoot() {
+    return type().isTestRoot();
   }
 }