From d4f3a7089333c6a751bf503a59fef88a1db6df51 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Fri, 7 Apr 2017 16:30:34 -0700
Subject: Replace custom annotation processor handling

Use LOCAL_ANNOTATION_PROCESSORS instead of custom annotation
processor handling.

Test: m -j java
Change-Id: Ia01cc51ea8dbe0842145789ef22a278573c1ee6b
---
 Android.mk | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index 21fa4c1dd..deb2fea3c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -74,24 +74,19 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
   dagger2-producers-host \
   guavalib
 
-# Disable the default discovery for annotation processors and explicitly specify
-# the path and classes needed. This is needed because otherwise it breaks a code
-# indexing tool that doesn't, as yet do automatic discovery.
-PROCESSOR_LIBRARIES := \
+LOCAL_ANNOTATION_PROCESSORS := \
   dagger2-auto-common-host \
   dagger2-auto-factory-host \
   dagger2-auto-service-host \
   dagger2-auto-value-host \
   guavalib
 
-PROCESSOR_CLASSES := \
+LOCAL_ANNOTATION_PROCESSOR_CLASSES := \
   com.google.auto.factory.processor.AutoFactoryProcessor \
   com.google.auto.service.processor.AutoServiceProcessor \
   com.google.auto.value.processor.AutoAnnotationProcessor \
   com.google.auto.value.processor.AutoValueProcessor
 
-include $(LOCAL_PATH)/java_annotation_processors.mk
-
 LOCAL_JAVA_LANGUAGE_VERSION := 1.7
 include $(BUILD_HOST_JAVA_LIBRARY)
 
-- 
cgit v1.2.3