commit dc24638eee827f7a150dd7e6e6bdcea811f0cee8
author Xin Li <delphij@google.com> Wed Feb 20 16:18:20 2019 -0800
committer Xin Li <delphij@google.com> Wed Feb 20 16:18:20 2019 -0800
tree e11956a7b1f81ac84084eb02597dc7c240d1903d
parent 0d3f891929aa9534e3c80933d6d3d0c3869da7bf
parent f4c0268dbfb34553c78ff11ba8bdc70090e3c38a

DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: I8d3477a74075d761caddc4400d0ff9698845050c

Android.bp

diff --git a/Android.bp b/Android.bp
index 0f05c97..96e08ed 100644
--- a/Android.bp
+++ b/Android.bp
@@ -28,10 +28,6 @@
     },
 
     // Use Dagger2 annotation processor
-    annotation_processors: ["dagger2-auto-value"],
+    plugins: ["dagger2-auto-value"],
     libs: ["dagger2-auto-value"],
-    // b/25860419: annotation processors must be explicitly specified for grok
-    annotation_processor_classes: [
-        "com.google.auto.value.processor.AutoValueProcessor",
-    ],
 }