2 files changed, 3 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
index 7a116e0815..af1a3493bd 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
@@ -988,7 +988,7 @@ public class AndroidCommon {
       // binding didn't reprocess a library's data binding expressions redundantly up the dependency
       // chain (meaning each depender processes them again as if they were its own), this problem
       // wouldn't happen.
-      Artifact annotationFile = DataBinding.createAnnotationFile(ruleContext, isLibrary);
+      Artifact annotationFile = DataBinding.createAnnotationFile(ruleContext);
       if (annotationFile != null) {
         srcs = ImmutableList.<Artifact>builder().addAll(srcs).add(annotationFile).build();
       }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/DataBinding.java b/src/main/java/com/google/devtools/build/lib/rules/android/DataBinding.java
index 6d498a1a7d..470b45e491 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/DataBinding.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/DataBinding.java
@@ -168,8 +168,6 @@ public final class DataBinding {
     // For full compilation:
     attributes.addProcessorPath(plugin.getProcessorClasspath());
     attributes.addAdditionalOutputs(getMetadataOutputs(ruleContext));
-
-    //addProcessorFlags(ruleContext, attributes, isBinary);
   }
 
   /**
@@ -223,9 +221,9 @@ public final class DataBinding {
    * end user code consumes.
    *
    * <p>This mostly just triggers the annotation processor. Annotation processor settings
-   * are configured in {@link #addProcessorFlags}.
+   * are configured separately in {@link #getJavacopts}.
    */
-  static Artifact createAnnotationFile(RuleContext ruleContext, boolean isLibrary) {
+  static Artifact createAnnotationFile(RuleContext ruleContext) {
     String contents;
     try {
       contents = ResourceFileLoader.loadResource(DataBinding.class,