diff options
| author | Zachary Heidepriem <zachh@google.com> | 2018-04-06 17:15:21 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-04-06 17:15:21 -0700 |
| commit | 401cf2993a3c5559549f293481d1ca6b7dcdd856 (patch) | |
| tree | 18c23e69505578f77c2a50ccf656a120c081807d /Android.mk | |
| parent | b5bc32c11ab5fce846463a5f10d4043f11438f58 (diff) | |
| parent | 295e807a0610a5497ecef1acc669a6f5ff37e08b (diff) | |
Merge "Reorganized rootcomponentgenerator package and added demo." am: 1ab138ae73
am: 295e807a06
Change-Id: I0d2580605860c92c9fe1e7161b7623cec6bdb24b
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 f142b653b..a1763860c 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 += \ @@ -154,7 +155,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 @@ -436,9 +437,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 \ |