diff options
| author | Zachary Heidepriem <zachh@google.com> | 2018-04-06 17:02:18 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-04-06 17:02:18 -0700 |
| commit | 295e807a0610a5497ecef1acc669a6f5ff37e08b (patch) | |
| tree | 77b3b90730c9e49bafefc3df232c2651241a892d /Android.mk | |
| parent | 2dee3ea1461d501c8adcec20344e2992fea08836 (diff) | |
| parent | 1ab138ae73314be6a54ee8d3aed18548f80be05e (diff) | |
Merge "Reorganized rootcomponentgenerator package and added demo."
am: 1ab138ae73
Change-Id: I917e5c5258ffe075b616c94eecf5c5df4dbc7f0b
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 \ |