From db5310f248cb71197b6420acc883850ce8593793 Mon Sep 17 00:00:00 2001
From: weijiaxu <weijiaxu@google.com>
Date: Thu, 5 Apr 2018 16:55:11 -0700
Subject: Change @DialerComponent to @IncludeInDialerRoot and turn on
 @IncludeInDialerRoot in root component generator.

Test: local test.
PiperOrigin-RevId: 191820677
Change-Id: I9df15cccf65e8c51c8fadf57eabec4fd41a51007
---
 .../processor/ComponentGeneratingStep.java                    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'java/com/android/dialer/rootcomponentgenerator/processor/ComponentGeneratingStep.java')

diff --git a/java/com/android/dialer/rootcomponentgenerator/processor/ComponentGeneratingStep.java b/java/com/android/dialer/rootcomponentgenerator/processor/ComponentGeneratingStep.java
index 8605499c7..04d42ac59 100644
--- a/java/com/android/dialer/rootcomponentgenerator/processor/ComponentGeneratingStep.java
+++ b/java/com/android/dialer/rootcomponentgenerator/processor/ComponentGeneratingStep.java
@@ -23,7 +23,7 @@ import static javax.lang.model.element.Modifier.PUBLIC;
 import static javax.lang.model.element.Modifier.STATIC;
 import static javax.lang.model.util.ElementFilter.typesIn;
 
-import com.android.dialer.rootcomponentgenerator.annotation.DialerComponent;
+import com.android.dialer.rootcomponentgenerator.annotation.IncludeInDialerRoot;
 import com.google.auto.common.BasicAnnotationProcessor.ProcessingStep;
 import com.google.auto.common.MoreElements;
 import com.google.common.base.Optional;
@@ -52,7 +52,7 @@ import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeMirror;
 
 /**
- * Generates component for a type annotated with {@link DialerComponent}.
+ * Generates component for a type annotated with {@link IncludeInDialerRoot}.
  *
  * <p>Our components have boilerplate code like:
  *
@@ -67,6 +67,7 @@ import javax.lang.model.type.TypeMirror;
  *      return ((HasComponent)((HasRootComponent) context.getApplicationContext()).component())
  *         .simulatorComponent();
  *   }
+ *   {@literal @}IncludeInDialerRoot
  *   public interface HasComponent {
  *      SimulatorComponent simulatorComponent();
  *  }
@@ -88,13 +89,13 @@ final class ComponentGeneratingStep implements ProcessingStep {
 
   @Override
   public Set<? extends Class<? extends Annotation>> annotations() {
-    return ImmutableSet.of(DialerComponent.class);
+    return ImmutableSet.of(IncludeInDialerRoot.class);
   }
 
   @Override
   public Set<? extends Element> process(
       SetMultimap<Class<? extends Annotation>, Element> elementsByAnnotation) {
-    for (TypeElement type : typesIn(elementsByAnnotation.get(DialerComponent.class))) {
+    for (TypeElement type : typesIn(elementsByAnnotation.get(IncludeInDialerRoot.class))) {
       generateComponent(type);
     }
     return Collections.emptySet();
@@ -124,7 +125,7 @@ final class ComponentGeneratingStep implements ProcessingStep {
   private AnnotationSpec makeDaggerSubcomponentAnnotation(TypeElement dialerComponentElement) {
 
     Optional<AnnotationMirror> componentMirror =
-        getAnnotationMirror(dialerComponentElement, DialerComponent.class);
+        getAnnotationMirror(dialerComponentElement, IncludeInDialerRoot.class);
 
     AnnotationSpec.Builder subcomponentBuilder = AnnotationSpec.builder(Subcomponent.class);
     for (AnnotationValue annotationValue :
-- 
cgit v1.2.3