diff options
5 files changed, 3 insertions, 40 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParamsStore.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParamsStore.java index 5d07f6d5cc..c1d2d9a59a 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParamsStore.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParamsStore.java @@ -19,14 +19,12 @@ import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization; -import com.google.devtools.build.lib.skylarkbuildapi.cpp.CcLinkParamsStoreApi; /** An implementation class for the AbstractCcLinkParamsStore. */ @AutoCodec @Deprecated // TODO(plf): Remove class, use CcLinkParams instances individually. -public final class CcLinkParamsStore extends AbstractCcLinkParamsStore - implements CcLinkParamsStoreApi { +public final class CcLinkParamsStore extends AbstractCcLinkParamsStore { public static final ObjectCodec<com.google.devtools.build.lib.rules.cpp.CcLinkParamsStore> CODEC = new CcLinkParamsStore_AutoCodec(); public static final Function<TransitiveInfoCollection, AbstractCcLinkParamsStore> TO_LINK_PARAMS = 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 8ec5841416..f593a44e60 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 @@ -136,7 +136,6 @@ public final class CcLinkingInfo extends NativeInfo implements CcLinkingInfoApi this.ccDynamicLibrariesForRuntime = ccDynamicLibrariesForRuntime; } - @Override public CcLinkParamsStore getCcLinkParamsStore() { return ccLinkParamsStore; } diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidCcLinkParamsProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidCcLinkParamsProviderApi.java index 15cffb4ad5..7f55e28e76 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidCcLinkParamsProviderApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidCcLinkParamsProviderApi.java @@ -16,7 +16,6 @@ package com.google.devtools.build.lib.skylarkbuildapi.android; import com.google.devtools.build.lib.skylarkbuildapi.ProviderApi; import com.google.devtools.build.lib.skylarkbuildapi.StructApi; -import com.google.devtools.build.lib.skylarkbuildapi.cpp.CcLinkParamsStoreApi; import com.google.devtools.build.lib.skylarkbuildapi.cpp.CcLinkingInfoApi; import com.google.devtools.build.lib.skylarkinterface.Param; import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable; @@ -48,10 +47,10 @@ public interface AndroidCcLinkParamsProviderApi<T extends CcLinkingInfoApi> exte parameters = { @Param( name = "store", - doc = "The cc link params store.", + doc = "The CcLinkingInfo provider.", positional = true, named = false, - type = CcLinkParamsStoreApi.class), + type = CcLinkingInfoApi.class), }, selfCall = true) @SkylarkConstructor(objectType = AndroidCcLinkParamsProviderApi.class) diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcLinkParamsStoreApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcLinkParamsStoreApi.java deleted file mode 100644 index 66e2fe53d1..0000000000 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcLinkParamsStoreApi.java +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2018 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.skylarkbuildapi.cpp; - -import com.google.devtools.build.lib.skylarkinterface.SkylarkModule; -import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory; - -/** Interface for Runfiles of C++ targets. */ -@SkylarkModule( - name = "CcLinkParamsStore", - documented = false, - category = SkylarkModuleCategory.BUILTIN, - doc = "Parameters that affect linking actions.") -public interface CcLinkParamsStoreApi {} diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcLinkingInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcLinkingInfoApi.java index fe57f3c4f0..590d00503e 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcLinkingInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcLinkingInfoApi.java @@ -64,11 +64,4 @@ public interface CcLinkingInfoApi extends StructApi { allowReturnNones = true, structField = true) CcLinkParamsApi getDynamicModeParamsForExecutable(); - - @SkylarkCallable( - name = "cc_link_params_store", - documented = false, - allowReturnNones = true, - structField = true) - public CcLinkParamsStoreApi getCcLinkParamsStore(); } |