diff options
| author | Colin Cross <ccross@android.com> | 2017-04-11 20:00:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-11 20:00:18 +0000 |
| commit | c0d82f8c593906e6240f74a944536296b3816273 (patch) | |
| tree | ca81268bd29cd805cd3c3f4fbaa94da8698f32fb | |
| parent | 4c8faefc7ec6ad578ee09c031006bff663c6cc45 (diff) | |
| parent | 28397e0a55eda5ec17d2a6b2bbed4c621a36434e (diff) | |
| download | caliper-c0d82f8c593906e6240f74a944536296b3816273.tar.gz | |
Replace custom annotation processor handling am: 8e31c1039e am: f0fe1779c9 am: 76675076d3
am: 28397e0a55
Change-Id: I3464375505ec3d67c46293da498ee61248d11cad
| -rw-r--r-- | Android.mk | 17 |
1 files changed, 4 insertions, 13 deletions
@@ -14,9 +14,6 @@ LOCAL_PATH := $(call my-dir) -# Include definitions of DAGGER2_PROCESSOR_CLASSES/LIBRARIES -include external/dagger2/dagger2_annotation_processor.mk - # build caliper host jar # ============================================================ @@ -42,17 +39,12 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ guavalib # Use Dagger2 annotation processor -PROCESSOR_LIBRARIES := $(DAGGER2_PROCESSOR_LIBRARIES) -PROCESSOR_CLASSES := $(DAGGER2_PROCESSOR_CLASSES) -include external/dagger2/java_annotation_processors.mk +LOCAL_ANNOTATION_PROCESSORS := dagger2-compiler-host +LOCAL_ANNOTATION_PROCESSOR_CLASSES := dagger.internal.codegen.ComponentProcessor LOCAL_JAVA_LANGUAGE_VERSION := 1.7 include $(BUILD_HOST_JAVA_LIBRARY) -# Remember the location of the generated files, this is needed for when -# building for target -caliper_host_generated_sources_dir := $(local-generated-sources-dir)/annotation_processor_output - # build caliper target api jar # ============================================================ # This contains just those classes needed for benchmarks to compile. @@ -94,9 +86,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ mockito-host # Use Dagger2 annotation processor -PROCESSOR_LIBRARIES := $(DAGGER2_PROCESSOR_LIBRARIES) -PROCESSOR_CLASSES := $(DAGGER2_PROCESSOR_CLASSES) -include external/dagger2/java_annotation_processors.mk +LOCAL_ANNOTATION_PROCESSORS := dagger2-compiler-host +LOCAL_ANNOTATION_PROCESSOR_CLASSES := dagger.internal.codegen.ComponentProcessor LOCAL_JAVA_LANGUAGE_VERSION := 1.7 include $(BUILD_HOST_JAVA_LIBRARY) |