diff options
| author |  Janak Ramakrishnan <janakr@google.com> | 2015-04-09 16:08:56 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2015-04-09 17:26:14 +0000 |
| commit | 6ef414114db29431d84bc6280191da4196afc346 (patch) | |
| tree | 1add36758df4b713de1d37f31e08bc5dc371ceff /src/main/java/com/google/devtools/build/lib/rules/cpp | |
| parent | 3522636b363e86d0a89200e2d569c7433cb92796 (diff) | |
Use injected action context when include scanning, not hard-coded CppCompilationActionContext, which can be overridden by some modules.
--
MOS_MIGRATED_REVID=90716346
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java index 5bbefe7360..8e8e27ced1 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java @@ -340,7 +340,7 @@ public class CppCompileAction extends AbstractAction implements IncludeScannable Executor executor = actionExecutionContext.getExecutor(); Collection<Artifact> initialResult; try { - initialResult = executor.getContext(CppCompileActionContext.class) + initialResult = executor.getContext(actionContext) .findAdditionalInputs(this, actionExecutionContext); } catch (ExecException e) { throw e.toActionExecutionException("Include scanning of rule '" + getOwner().getLabel() + "'", |