diff options
| author |  ajmichael <ajmichael@google.com> | 2017-09-19 01:58:28 +0200 |
|---|---|---|
| committer |  László Csomor <laszlocsomor@google.com> | 2017-09-19 09:33:11 +0200 |
| commit | 8ae50f0dea14a8c3b0fcc9002d89a54ef559f3be (patch) | |
| tree | 231abe3fcf78c298d87d7cb7c1969a8f1c97c973 /src/main/java/com | |
| parent | c5238ac86cd8cf7bfe43b5dd9e0ff81113cf89fa (diff) | |
Cleanup some databinding code that was messed up by https://github.com/bazelbuild/bazel/commit/b30b3de23a7fa01b8290ace0e688d75405689825
RELNOTES: None
PiperOrigin-RevId: 169169249
Diffstat (limited to 'src/main/java/com')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/DataBinding.java | 6 |
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, |