Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ab138ae authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Reorganized rootcomponentgenerator package and added demo."

parents c5eeb70d 7acd97f6

Android.mk

+10 −5
Original line number Diff line number Diff line
@@ -39,7 +39,8 @@ EXCLUDE_FILES += \ 


# Exclude rootcomponentgenerator

EXCLUDE_FILES += \

	$(call all-java-files-under, $(BASE_DIR)/dialer/rootcomponentgenerator/processor)

	$(call all-java-files-under, $(BASE_DIR)/dialer/rootcomponentgenerator) \

	$(call all-java-files-under, $(BASE_DIR)/dialer/inject/demo)



# Exclude build variants for now

EXCLUDE_FILES += \
@@ -149,7 +150,7 @@ LOCAL_ANNOTATION_PROCESSORS := \ 
	dialer-rootcomponentprocessor



LOCAL_ANNOTATION_PROCESSOR_CLASSES := \

  com.google.auto.value.processor.AutoValueProcessor,dagger.internal.codegen.ComponentProcessor,com.bumptech.glide.annotation.compiler.GlideAnnotationProcessor,com.android.dialer.rootcomponentgenerator.processor.RootComponentProcessor

  com.google.auto.value.processor.AutoValueProcessor,dagger.internal.codegen.ComponentProcessor,com.bumptech.glide.annotation.compiler.GlideAnnotationProcessor,com.android.dialer.rootcomponentgenerator.RootComponentProcessor



# Begin Bug: 37077388

LOCAL_DX_FLAGS := --multi-dex
@@ -431,9 +432,13 @@ LOCAL_IS_HOST_MODULE := true 
BASE_DIR := java/com/android



LOCAL_SRC_FILES := \

	$(call all-java-files-under, $(BASE_DIR)/dialer/rootcomponentgenerator/annotation) \

	$(call all-java-files-under, $(BASE_DIR)/dialer/rootcomponentgenerator/processor)



	$(call all-java-files-under, $(BASE_DIR)/dialer/rootcomponentgenerator) \

        $(BASE_DIR)/dialer/inject/DialerRootComponent.java \

        $(BASE_DIR)/dialer/inject/DialerVariant.java \

        $(BASE_DIR)/dialer/inject/HasRootComponent.java \

        $(BASE_DIR)/dialer/inject/IncludeInDialerRoot.java \

        $(BASE_DIR)/dialer/inject/InstallIn.java \

        $(BASE_DIR)/dialer/inject/RootComponentGeneratorMetadata.java



LOCAL_STATIC_JAVA_LIBRARIES := \

	dialer-guava \

java/com/android/dialer/inject/ContextModule.java

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import dagger.Provides; 


/** Provides the singleton application context object. */

@Module

@InstallIn(variants = {DialerVariant.DIALER_DEMO, DialerVariant.DIALER_TEST})

public final class ContextModule {



  @NonNull private final Context context;

java/com/android/dialer/rootcomponentgenerator/annotation/DialerRootComponent.java→java/com/android/dialer/inject/DialerRootComponent.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License

 */



package com.android.dialer.rootcomponentgenerator.annotation;

package com.android.dialer.inject;



import java.lang.annotation.ElementType;

import java.lang.annotation.Retention;

java/com/android/dialer/rootcomponentgenerator/annotation/DialerVariant.java→java/com/android/dialer/inject/DialerVariant.java

+4 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License

 */



package com.android.dialer.rootcomponentgenerator.annotation;

package com.android.dialer.inject;



/** Represents all dialer variants. */

public enum DialerVariant {
@@ -27,7 +27,9 @@ public enum DialerVariant { 


  // TEST variant will be used in situations where we need create in-test application class which

  // doesn't belong to any variants listed above

  DIALER_TEST("DialerTest");

  DIALER_TEST("DialerTest"),

  // Just for sample code in inject/demo.

  DIALER_DEMO("DialerDemo");



  private final String variant;

java/com/android/dialer/rootcomponentgenerator/annotation/IncludeInDialerRoot.java→java/com/android/dialer/inject/IncludeInDialerRoot.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License

 */



package com.android.dialer.rootcomponentgenerator.annotation;

package com.android.dialer.inject;



import java.lang.annotation.ElementType;

import java.lang.annotation.Target;