diff options
| author |  kmb <kmb@google.com> | 2017-10-27 19:19:05 -0400 |
|---|---|---|
| committer |  John Cater <jcater@google.com> | 2017-10-30 10:41:07 -0400 |
| commit | f8db228498845a58eca980e5855e0caa464dd646 (patch) | |
| tree | 002d69c314197347b782420ed9ea3b206d0ebca3 /src/main/java/com/google/devtools/build/lib/rules | |
| parent | b1e8dafce6f5e587db3e0d1a8c775f23a9585c68 (diff) | |
Add call to checkDesugarDeps in AndroidBinary.
PiperOrigin-RevId: 173731752
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java index c48dc11fce..1bb27a6e08 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java @@ -341,7 +341,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { Function<Artifact, Artifact> derivedJarFunction = collectDesugaredJars(ruleContext, androidCommon, androidSemantics, resourceClasses); Artifact deployJar = createDeployJar(ruleContext, javaSemantics, androidCommon, resourceClasses, - derivedJarFunction); + AndroidCommon.getAndroidConfig(ruleContext).checkDesugarDeps(), derivedJarFunction); OneVersionEnforcementLevel oneVersionEnforcementLevel = ruleContext.getFragment(JavaConfiguration.class).oneVersionEnforcementLevel(); @@ -760,6 +760,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { JavaSemantics javaSemantics, AndroidCommon common, JavaTargetAttributes attributes, + boolean checkDesugarDeps, Function<Artifact, Artifact> derivedJarFunction) throws InterruptedException { Artifact deployJar = @@ -769,7 +770,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { .setAttributes(attributes) .addRuntimeJars(common.getRuntimeJars()) .setDerivedJarFunction(derivedJarFunction) - .setCheckDesugarDeps(AndroidCommon.getAndroidConfig(ruleContext).checkDesugarDeps()) + .setCheckDesugarDeps(checkDesugarDeps) .build(); return deployJar; } |