diff options
| author | Colin Cross <ccross@android.com> | 2017-04-11 18:38:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-11 18:38:58 +0000 |
| commit | 76675076d3d8913f880e856837a8b068353ce79d (patch) | |
| tree | ca81268bd29cd805cd3c3f4fbaa94da8698f32fb | |
| parent | 0e750eb0750150904c005a2a68e49ba2993913eb (diff) | |
| parent | f0fe1779c991fbc158c5d06d0c67accb7107d42b (diff) | |
| download | caliper-76675076d3d8913f880e856837a8b068353ce79d.tar.gz | |
Replace custom annotation processor handling am: 8e31c1039e
am: f0fe1779c9
Change-Id: Icbada5f37c11e07a0d872e0274a6603c90509a5c
| -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) |