diff options
| author |  cparsons <cparsons@google.com> | 2017-07-14 05:50:26 +0200 |
|---|---|---|
| committer |  László Csomor <laszlocsomor@google.com> | 2017-07-14 10:52:28 +0200 |
| commit | eff8b3de39591a0ecedaa3c7e2bdb0fafe2c2ed6 (patch) | |
| tree | dfbde6f768825e4e21ddad64c616ccd44ccb99e4 /src/main/java/com/google/devtools/build | |
| parent | 3b85af5e392eaca760d93db2c0ce4418efed557a (diff) | |
Partial rollback of action_config validation logic
This was causing some builds to error more aggressively than before.
RELNOTES: None.
PiperOrigin-RevId: 161907484
Diffstat (limited to 'src/main/java/com/google/devtools/build')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java index 617460b208..19e9fa93d1 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java @@ -345,10 +345,7 @@ public class CppCompileActionBuilder { allowUsingHeaderModules && featureConfiguration.isEnabled(CppRuleClasses.USE_HEADER_MODULES); - if (!featureConfiguration.actionIsConfigured(getActionName())) { - errorCollector.accept( - String.format("Expected action_config for '%s' to be configured", getActionName())); - } else { + if (featureConfiguration.actionIsConfigured(getActionName())) { for (String executionRequirement : featureConfiguration.getToolForAction(getActionName()).getExecutionRequirements()) { executionInfo.put(executionRequirement, ""); |