diff options
author | plf <plf@google.com> | 2018-05-14 07:55:59 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-05-14 07:57:08 -0700 |
commit | ed87aad47060edaa01eb26078908d275acb91742 (patch) | |
tree | ce1a9c9cb3359ca3f3adc568e68d94a20eec8c8f /src/main/java/com/google | |
parent | d753ad59fde12d4dd01c52f9dc5a41e635caf2d5 (diff) |
C++: Renames CcRunfilesInfo to CcRunfiles
Since it's not a provider, it doesn't need the Info suffix anymore.
RELNOTES:none
PiperOrigin-RevId: 196505329
Diffstat (limited to 'src/main/java/com/google')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java | 2 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java | 4 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingHelper.java | 5 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingInfo.java | 20 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CcRunfiles.java (renamed from src/main/java/com/google/devtools/build/lib/rules/cpp/CcRunfilesInfo.java) | 12 |
5 files changed, 21 insertions, 22 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java index 22dfdbd283..80b3f0e379 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java @@ -109,7 +109,7 @@ public abstract class CcBinary implements RuleConfiguredTargetFactory { Runfiles.Builder builder = new Runfiles.Builder( context.getWorkspaceName(), context.getConfiguration().legacyExternalRunfiles()); Function<TransitiveInfoCollection, Runfiles> runfilesMapping = - CcRunfilesInfo.runfilesFunction(linkingMode != Link.LinkingMode.DYNAMIC); + CcRunfiles.runfilesFunction(linkingMode != Link.LinkingMode.DYNAMIC); builder.addTransitiveArtifacts(filesToBuild); // Add the shared libraries to the runfiles. This adds any shared libraries that are in the // srcs of this target. diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java index cd883d1d35..77d4f1ef6f 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java @@ -81,7 +81,7 @@ public abstract class CcLibrary implements RuleConfiguredTargetFactory { // it, but instead be loaded as an extension. So we need the dynamic library for this in the // runfiles. builder.addArtifacts(ccLinkingOutputs.getLibrariesForRunfiles(linkingStatically && !neverLink)); - builder.add(context, CcRunfilesInfo.runfilesFunction(linkingStatically)); + builder.add(context, CcRunfiles.runfilesFunction(linkingStatically)); builder.addDataDeps(context); @@ -377,7 +377,7 @@ public abstract class CcLibrary implements RuleConfiguredTargetFactory { ccLinkingInfoBuilder.setCcLinkParamsInfo(ccLinkingInfo.getCcLinkParamsInfo()); ccLinkingInfoBuilder.setCcExecutionDynamicLibrariesInfo( ccLinkingInfo.getCcExecutionDynamicLibrariesInfo()); - ccLinkingInfoBuilder.setCcRunfilesInfo(new CcRunfilesInfo(staticRunfiles, sharedRunfiles)); + ccLinkingInfoBuilder.setCcRunfiles(new CcRunfiles(staticRunfiles, sharedRunfiles)); return ccLinkingInfoBuilder.build(); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingHelper.java index e9ee36a498..dc65052682 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingHelper.java @@ -540,8 +540,7 @@ public final class CcLinkingHelper { Runfiles cppSharedRunfiles = collectCppRunfiles(ccLinkingOutputs, false); CcLinkingInfo.Builder ccLinkingInfoBuilder = CcLinkingInfo.Builder.create(); - ccLinkingInfoBuilder.setCcRunfilesInfo( - new CcRunfilesInfo(cppStaticRunfiles, cppSharedRunfiles)); + ccLinkingInfoBuilder.setCcRunfiles(new CcRunfiles(cppStaticRunfiles, cppSharedRunfiles)); ccLinkingInfoBuilder.setCcExecutionDynamicLibrariesInfo( collectExecutionDynamicLibraryArtifacts(ccLinkingOutputs.getExecutionDynamicLibraries())); @@ -628,7 +627,7 @@ public final class CcLinkingHelper { ruleContext.getWorkspaceName(), ruleContext.getConfiguration().legacyExternalRunfiles()); builder.addTargets(deps, RunfilesProvider.DEFAULT_RUNFILES); - builder.addTargets(deps, CcRunfilesInfo.runfilesFunction(linkingStatically)); + builder.addTargets(deps, CcRunfiles.runfilesFunction(linkingStatically)); // Add the shared libraries to the runfiles. builder.addArtifacts(ccLinkingOutputs.getLibrariesForRunfiles(linkingStatically)); return builder.build(); diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingInfo.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingInfo.java index a5cdeb13ed..4edbdf97bb 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingInfo.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingInfo.java @@ -37,18 +37,18 @@ public final class CcLinkingInfo extends NativeInfo { new NativeProvider<CcLinkingInfo>(CcLinkingInfo.class, "CcLinkingInfo") {}; private final CcLinkParamsInfo ccLinkParamsInfo; - private final CcRunfilesInfo ccRunfilesInfo; + private final CcRunfiles ccRunfiles; private final CcExecutionDynamicLibrariesInfo ccExecutionDynamicLibrariesInfo; @AutoCodec.Instantiator @VisibleForSerialization CcLinkingInfo( CcLinkParamsInfo ccLinkParamsInfo, - CcRunfilesInfo ccRunfilesInfo, + CcRunfiles ccRunfiles, CcExecutionDynamicLibrariesInfo ccExecutionDynamicLibrariesInfo) { super(PROVIDER); this.ccLinkParamsInfo = ccLinkParamsInfo; - this.ccRunfilesInfo = ccRunfilesInfo; + this.ccRunfiles = ccRunfiles; this.ccExecutionDynamicLibrariesInfo = ccExecutionDynamicLibrariesInfo; } @@ -56,8 +56,8 @@ public final class CcLinkingInfo extends NativeInfo { return ccLinkParamsInfo; } - public CcRunfilesInfo getCcRunfilesInfo() { - return ccRunfilesInfo; + public CcRunfiles getCcRunfiles() { + return ccRunfiles; } public CcExecutionDynamicLibrariesInfo getCcExecutionDynamicLibrariesInfo() { @@ -67,7 +67,7 @@ public final class CcLinkingInfo extends NativeInfo { /** A Builder for {@link CcLinkingInfo}. */ public static class Builder { CcLinkParamsInfo ccLinkParamsInfo; - CcRunfilesInfo ccRunfilesInfo; + CcRunfiles ccRunfiles; CcExecutionDynamicLibrariesInfo ccExecutionDynamicLibrariesInfo; public static CcLinkingInfo.Builder create() { @@ -80,9 +80,9 @@ public final class CcLinkingInfo extends NativeInfo { return this; } - public Builder setCcRunfilesInfo(CcRunfilesInfo ccRunfilesInfo) { - Preconditions.checkState(this.ccRunfilesInfo == null); - this.ccRunfilesInfo = ccRunfilesInfo; + public Builder setCcRunfiles(CcRunfiles ccRunfiles) { + Preconditions.checkState(this.ccRunfiles == null); + this.ccRunfiles = ccRunfiles; return this; } @@ -94,7 +94,7 @@ public final class CcLinkingInfo extends NativeInfo { } public CcLinkingInfo build() { - return new CcLinkingInfo(ccLinkParamsInfo, ccRunfilesInfo, ccExecutionDynamicLibrariesInfo); + return new CcLinkingInfo(ccLinkParamsInfo, ccRunfiles, ccExecutionDynamicLibrariesInfo); } } } diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcRunfilesInfo.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcRunfiles.java index c6c8d3580f..d1d8e98d90 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcRunfilesInfo.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcRunfiles.java @@ -28,13 +28,13 @@ import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; */ @Immutable @AutoCodec -public final class CcRunfilesInfo { +public final class CcRunfiles { private final Runfiles staticRunfiles; private final Runfiles sharedRunfiles; @AutoCodec.Instantiator - public CcRunfilesInfo(Runfiles staticRunfiles, Runfiles sharedRunfiles) { + public CcRunfiles(Runfiles staticRunfiles, Runfiles sharedRunfiles) { this.staticRunfiles = staticRunfiles; this.sharedRunfiles = sharedRunfiles; } @@ -54,8 +54,8 @@ public final class CcRunfilesInfo { public static final Function<TransitiveInfoCollection, Runfiles> STATIC_RUNFILES = input -> { CcLinkingInfo provider = input.get(CcLinkingInfo.PROVIDER); - CcRunfilesInfo ccRunfilesInfo = provider == null ? null : provider.getCcRunfilesInfo(); - return ccRunfilesInfo == null ? Runfiles.EMPTY : ccRunfilesInfo.getStaticRunfiles(); + CcRunfiles ccRunfiles = provider == null ? null : provider.getCcRunfiles(); + return ccRunfiles == null ? Runfiles.EMPTY : ccRunfiles.getStaticRunfiles(); }; /** @@ -65,8 +65,8 @@ public final class CcRunfilesInfo { public static final Function<TransitiveInfoCollection, Runfiles> SHARED_RUNFILES = input -> { CcLinkingInfo provider = input.get(CcLinkingInfo.PROVIDER); - CcRunfilesInfo ccRunfilesInfo = provider == null ? null : provider.getCcRunfilesInfo(); - return ccRunfilesInfo == null ? Runfiles.EMPTY : ccRunfilesInfo.getSharedRunfiles(); + CcRunfiles ccRunfiles = provider == null ? null : provider.getCcRunfiles(); + return ccRunfiles == null ? Runfiles.EMPTY : ccRunfiles.getSharedRunfiles(); }; /** |