diff options
| author |  brandjon <brandjon@google.com> | 2017-06-15 23:26:23 +0200 |
|---|---|---|
| committer |  Yun Peng <pcloudy@google.com> | 2017-06-16 09:27:20 +0200 |
| commit | 68b9a7e2dc17e32b194238d287e79bee1ba035b9 (patch) | |
| tree | 666f6a6e093ec81d5dab8dc9ff0ab63f22710465 /src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java | |
| parent | 8effaa779808cc22d3312b0a353cfa7e3e084f20 (diff) | |
Automated g4 rollback of commit da56606563ee9df438db93392f681bf2abb4ac97.
NO_SQ=Only failing TAP targets in our project are from an unrelated bug.
*** Reason for rollback ***
Initially we thought this broke just a few builds that were fixed in the depot. The scope is wider than that, affecting at least these two targets:
[]
[]
There are hundreds of other failures in the TGP results that we haven't traced to a cause yet, but it's troubling that this CL was implicated twice in the small sampling I did.
[]
*** Original change description ***
Use JavaCompilationArtifacts instead of JavaCompilationArgs
to store Java compilation artifacts. Round-tripping through
JavaCompilationArgs loses dependency information that upstream
compilations use to optimize compile time classpaths.
PiperOrigin-RevId: 159154375
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java index debd453926..967756c490 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java @@ -46,8 +46,8 @@ import com.google.devtools.build.lib.packages.Attribute; import com.google.devtools.build.lib.packages.AttributeMap; import com.google.devtools.build.lib.packages.NativeAspectClass; import com.google.devtools.build.lib.packages.Rule; +import com.google.devtools.build.lib.rules.java.JavaCompilationArgs; import com.google.devtools.build.lib.rules.java.JavaCompilationArgsProvider; -import com.google.devtools.build.lib.rules.java.JavaCompilationArtifacts; import com.google.devtools.build.lib.rules.java.JavaCompilationHelper; import com.google.devtools.build.lib.rules.java.JavaConfiguration; import com.google.devtools.build.lib.rules.java.JavaHelper; @@ -255,7 +255,7 @@ public class JavaLiteProtoAspect extends NativeAspectClass implements Configured helper.addDep(runtime.getProvider(JavaCompilationArgsProvider.class)); } helper.setCompilationStrictDepsMode(StrictDepsMode.OFF); - JavaCompilationArtifacts artifacts = + JavaCompilationArgs artifacts = helper.build( javaSemantics, JavaCompilationHelper.getJavaToolchainProvider(ruleContext), |