diff options
author | Googler <noreply@google.com> | 2018-08-07 09:04:34 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-08-07 09:06:15 -0700 |
commit | e37dd1deda6a2d12886c456ffc072980eeb69677 (patch) | |
tree | 1c8c51db35507c2267aef4cc4a356b1e6a17db97 /src/main/java/com/google/devtools/build/lib/rules | |
parent | 02a6e0f8ac34a4ca44cad6c8b2eba81645da10e4 (diff) |
Delete the now unused ExtractInclusionAction.
RELNOTES: None.
PiperOrigin-RevId: 207724147
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/ExtractInclusionAction.java | 87 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/IncludeScannable.java | 2 |
2 files changed, 1 insertions, 88 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/ExtractInclusionAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/ExtractInclusionAction.java deleted file mode 100644 index f03d4ee9c1..0000000000 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/ExtractInclusionAction.java +++ /dev/null @@ -1,87 +0,0 @@ -// Copyright 2014 The Bazel Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package com.google.devtools.build.lib.rules.cpp; - -import com.google.common.collect.ImmutableList; -import com.google.devtools.build.lib.actions.AbstractAction; -import com.google.devtools.build.lib.actions.ActionExecutionContext; -import com.google.devtools.build.lib.actions.ActionExecutionException; -import com.google.devtools.build.lib.actions.ActionKeyContext; -import com.google.devtools.build.lib.actions.ActionOwner; -import com.google.devtools.build.lib.actions.ActionResult; -import com.google.devtools.build.lib.actions.Artifact; -import com.google.devtools.build.lib.actions.ExecException; -import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; -import com.google.devtools.build.lib.util.Fingerprint; -import java.io.IOException; - -/** - * An action which greps for includes over a given .cc or .h file. This is a part of the work - * required for C++ include scanning. - * - * <p>For generated files, it is advantageous to do this remotely, to avoid having to download the - * generated file. - * - * <p>Note that this may run grep-includes over-optimistically, where we previously had not. For - * example, consider a cc_library of generated headers. If another library depends on it, and only - * references one of the headers, the other grep-includes will have been wasted. - */ -@AutoCodec -@Immutable -final class ExtractInclusionAction extends AbstractAction { - - private static final String GUID = "45b43e5a-4734-43bb-a05e-012313808142"; - - private final Artifact grepIncludes; - - /** Constructs a new action. */ - public ExtractInclusionAction( - ActionOwner owner, Artifact primaryInput, Artifact primaryOutput, Artifact grepIncludes) { - super(owner, ImmutableList.of(primaryInput, grepIncludes), ImmutableList.of(primaryOutput)); - this.grepIncludes = grepIncludes; - } - - @Override - protected void computeKey(ActionKeyContext actionKeyContext, Fingerprint fp) { - fp.addString(GUID); - } - - @Override - public String getMnemonic() { - return "GrepIncludes"; - } - - @Override - protected String getRawProgressMessage() { - return "Extracting include lines from " + getPrimaryInput().prettyPrint(); - } - - @Override - public ActionResult execute(ActionExecutionContext actionExecutionContext) - throws ActionExecutionException, InterruptedException { - CppIncludeExtractionContext context = - actionExecutionContext.getContext(CppIncludeExtractionContext.class); - try { - context.extractIncludes( - actionExecutionContext, this, getPrimaryInput(), getPrimaryOutput(), grepIncludes); - } catch (IOException e) { - throw new ActionExecutionException(e, this, false); - } catch (ExecException e) { - throw e.toActionExecutionException(this); - } - return ActionResult.EMPTY; - } -} diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/IncludeScannable.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/IncludeScannable.java index 9eb3806989..87cbf00e32 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/IncludeScannable.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/IncludeScannable.java @@ -92,7 +92,7 @@ public interface IncludeScannable { NestedSet<Artifact> getDeclaredIncludeSrcs(); /** - * Returns an artifact that is the executable for {@link ExtractInclusionAction}. + * Returns an artifact that is the executable for grepping #include lines from a file. */ Artifact getGrepIncludes(); |