diff options
author | 2018-07-25 15:00:14 -0700 | |
---|---|---|
committer | 2018-07-25 15:02:02 -0700 | |
commit | 1ed89aa24c91248fc062477250d5188940a848de (patch) | |
tree | 52dd5f464cedcc69f7576a3897cad89e0aba3b27 /src/main/java/com/google/devtools/build/lib/rules/cpp | |
parent | 03bd99d4a4a6ae51b45907fc4b8677eeafe1d6c8 (diff) |
Automated rollback of commit 16dde0de06a3a4157a13e7e7264afeb6a50b2dde.
*** Reason for rollback ***
Crash (see linked bug).
PiperOrigin-RevId: 206060905
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/CcLinkingInfo.java | 51 |
1 files changed, 0 insertions, 51 deletions
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 7acd2631d0..a8a27515af 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 @@ -187,10 +187,6 @@ public final class CcLinkingInfo extends NativeInfo implements CcLinkingInfoApi /** A Builder for {@link CcLinkingInfo}. */ public static class Builder { CcLinkParamsStore ccLinkParamsStore; - CcLinkParams staticModeParamsForDynamicLibrary; - CcLinkParams staticModeParamsForExecutable; - CcLinkParams dynamicModeParamsForDynamicLibrary; - CcLinkParams dynamicModeParamsForExecutable; CcRunfiles ccRunfiles; CcDynamicLibrariesForRuntime ccDynamicLibrariesForRuntime; @@ -198,15 +194,8 @@ public final class CcLinkingInfo extends NativeInfo implements CcLinkingInfoApi return new CcLinkingInfo.Builder(); } - @Deprecated - // TODO(b/111781390): Use individual setters for each flavor of CcLinkParams. Not all callsites - // are being refactored at once. Work in progress. public Builder setCcLinkParamsStore(CcLinkParamsStore ccLinkParamsStore) { Preconditions.checkState(this.ccLinkParamsStore == null); - Preconditions.checkState(this.staticModeParamsForDynamicLibrary == null); - Preconditions.checkState(this.staticModeParamsForExecutable == null); - Preconditions.checkState(this.dynamicModeParamsForDynamicLibrary == null); - Preconditions.checkState(this.dynamicModeParamsForExecutable == null); this.ccLinkParamsStore = ccLinkParamsStore; return this; } @@ -224,47 +213,7 @@ public final class CcLinkingInfo extends NativeInfo implements CcLinkingInfoApi return this; } - public Builder setStaticModeParamsForDynamicLibrary(CcLinkParams ccLinkParams) { - Preconditions.checkState( - this.staticModeParamsForDynamicLibrary == null && ccLinkParamsStore == null); - this.staticModeParamsForDynamicLibrary = ccLinkParams; - return this; - } - - public Builder setStaticModeParamsForExecutable(CcLinkParams ccLinkParams) { - Preconditions.checkState( - this.staticModeParamsForExecutable == null && ccLinkParamsStore == null); - this.staticModeParamsForExecutable = ccLinkParams; - return this; - } - - public Builder setDynamicModeParamsForDynamicLibrary(CcLinkParams ccLinkParams) { - Preconditions.checkState( - this.dynamicModeParamsForDynamicLibrary == null && ccLinkParamsStore == null); - this.dynamicModeParamsForDynamicLibrary = ccLinkParams; - return this; - } - - public Builder setDynamicModeParamsForExecutable(CcLinkParams ccLinkParams) { - Preconditions.checkState( - this.dynamicModeParamsForExecutable == null && ccLinkParamsStore == null); - this.dynamicModeParamsForExecutable = ccLinkParams; - return this; - } - public CcLinkingInfo build() { - if (ccLinkParamsStore == null) { - Preconditions.checkNotNull(staticModeParamsForDynamicLibrary); - Preconditions.checkNotNull(staticModeParamsForExecutable); - Preconditions.checkNotNull(dynamicModeParamsForDynamicLibrary); - Preconditions.checkNotNull(dynamicModeParamsForExecutable); - ccLinkParamsStore = - new CcLinkParamsStore( - staticModeParamsForDynamicLibrary, - staticModeParamsForExecutable, - dynamicModeParamsForDynamicLibrary, - dynamicModeParamsForExecutable); - } return new CcLinkingInfo(ccLinkParamsStore, ccRunfiles, ccDynamicLibrariesForRuntime); } } |