diff options
| author |  plf <plf@google.com> | 2018-05-25 02:49:14 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-25 02:50:22 -0700 |
| commit | 39465706a24a96074cd04aa890a2ccd4c6291866 (patch) | |
| tree | 64089f7e81a64fe82053796137079f19114e20f4 /src/main/java/com/google/devtools | |
| parent | 7fd3b003ac45413b5808e589ab4770a511b6e34c (diff) | |
Automated rollback of commit d62833f640690309e1a73aefa62de1d8821dc8ba.
RELNOTES:none
PiperOrigin-RevId: 198025150
Diffstat (limited to 'src/main/java/com/google/devtools')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppModuleMapAction.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java index 611193a5a7..5b782ef492 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java @@ -950,7 +950,7 @@ public final class CcCompilationHelper { ccCompilationContextBuilder.addDeclaredIncludeSrcs(additionalInputs); ccCompilationContextBuilder.addNonCodeInputs(additionalInputs); ccCompilationContextBuilder.addModularHdrs(publicHeaders.getHeaders()); - ccCompilationContextBuilder.addTextualHdrs(privateHeaders); + ccCompilationContextBuilder.addModularHdrs(privateHeaders); ccCompilationContextBuilder.addTextualHdrs(publicTextualHeaders); ccCompilationContextBuilder.addPregreppedHeaders( CppHelper.createExtractInclusions(ruleContext, semantics, publicHeaders.getHeaders())); diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModuleMapAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModuleMapAction.java index 05d78cf745..602089b691 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModuleMapAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModuleMapAction.java @@ -140,7 +140,7 @@ public final class CppModuleMapAction extends AbstractFileWriteAction { "private", artifact.getExecPath(), leadingPeriods, - /*canCompile=*/ false, + /*canCompile=*/ true, deduper, /*isUmbrellaHeader*/ false); } |