diff options
| author | Zachary Heidepriem <zachh@google.com> | 2018-04-06 12:28:36 -0700 |
|---|---|---|
| committer | Zachary Heidepriem <zachh@google.com> | 2018-04-06 13:20:02 -0700 |
| commit | 7acd97f63fdd4fad9fbbdbf7e941dda03b04e44a (patch) | |
| tree | 992a1f0ad5300dd19a95572e0f540944be12fce7 /Android.mk | |
| parent | 2725d7980278f8277d042c5087a2a1e467bbaa7b (diff) | |
| download | android_packages_apps_Dialer-7acd97f63fdd4fad9fbbdbf7e941dda03b04e44a.tar.gz android_packages_apps_Dialer-7acd97f63fdd4fad9fbbdbf7e941dda03b04e44a.tar.bz2 android_packages_apps_Dialer-7acd97f63fdd4fad9fbbdbf7e941dda03b04e44a.zip | |
Reorganized rootcomponentgenerator package and added demo.
-Moved rootcomponentgenerator/annotations to dialer/inject to reduce the number of deps engineers need to include
-Move rootcomponentgenerator/processor into rootcomponentgenerator/ since the other package is now gone
-Added inject/demo and tests
TEST=unit, tap
Test: unit, tap
PiperOrigin-RevId: 191916595
Change-Id: Ic155808c7435bdce198970caa92309edb9fadac8
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk index 1145621a8..b71f70243 100644 --- a/Android.mk +++ b/Android.mk @@ -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 \ |