diff options
| author |  Googler <noreply@google.com> | 2017-07-06 21:09:30 -0400 |
|---|---|---|
| committer |  John Cater <jcater@google.com> | 2017-07-07 07:08:31 -0400 |
| commit | cf483e472790fad1503c5728f7c91dd84f7d9348 (patch) | |
| tree | 9f4de8985ec31897bec9b8ab437a1a24cc22150b /src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java | |
| parent | 62d9276be1a3c4840dc8dd8839480308528f97c1 (diff) | |
Switch from using set/getPchFile on CompilationArtifacts to a doNotUsePch option on CompilationSupport. In the process correctly respect whether to use the pch file under crosstool compilation mode.
PiperOrigin-RevId: 161156717
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java index bd3ecd4309..81b9bfb19d 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java @@ -271,6 +271,7 @@ public class J2ObjcAspect extends NativeAspectClass implements ConfiguredAspectF new CompilationSupport.Builder() .setRuleContext(ruleContext) .setIntermediateArtifacts(ObjcRuleClasses.j2objcIntermediateArtifacts(ruleContext)) + .doNotUsePch() .build(); compilationSupport @@ -792,7 +793,6 @@ public class J2ObjcAspect extends NativeAspectClass implements ConfiguredAspectF CompilationArtifacts compilationArtifacts = new CompilationArtifacts.Builder() .addNonArcSrcs(transpiledSources) .setIntermediateArtifacts(intermediateArtifacts) - .setPchFile(Optional.<Artifact>absent()) .addAdditionalHdrs(transpiledHeaders) .build(); builder.setCompilationArtifacts(compilationArtifacts); |