From cf483e472790fad1503c5728f7c91dd84f7d9348 Mon Sep 17 00:00:00 2001 From: Googler Date: Thu, 6 Jul 2017 21:09:30 -0400 Subject: 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 --- .../java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java') 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.absent()) .addAdditionalHdrs(transpiledHeaders) .build(); builder.setCompilationArtifacts(compilationArtifacts); -- cgit v1.2.3