diff options
| author |  Manuel Klimek <klimek@google.com> | 2015-08-10 13:24:08 +0000 |
|---|---|---|
| committer |  Laszlo Csomor <laszlocsomor@google.com> | 2015-08-11 07:51:22 +0000 |
| commit | 310a1ebff45fb19d36edf0e09afda724de1158c8 (patch) | |
| tree | d5be42829f1ba33d58844a3876730247f00e5429 /src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java | |
| parent | 42574a4d2ffd18947430186c5309df87e4c80c18 (diff) | |
Add a feature to control whether we provide transitive header modules to a
modules enabled build.
--
MOS_MIGRATED_REVID=100272810
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java index 440c715b9a..790a9d7d97 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java @@ -801,8 +801,9 @@ public final class CcLibraryHelper { if (model.getGeneratesNoPicHeaderModule()) { contextBuilder.setHeaderModule(model.getHeaderModule(cppModuleMap.getArtifact())); } - if (featureConfiguration.isEnabled(CppRuleClasses.USE_HEADER_MODULES)) { - contextBuilder.setUsingHeaderModules(true); + if (featureConfiguration.isEnabled(CppRuleClasses.USE_HEADER_MODULES) + && featureConfiguration.isEnabled(CppRuleClasses.TRANSITIVE_MODULE_MAPS)) { + contextBuilder.setProvideTransitiveModuleMaps(true); } } |