SkylarkCallbackFunction no longer cares about the obsolete 'cfg' parameter.

Depot cleanup is in unknown commit.

RELNOTES[INC]: Callback functions in Skylark no longer support the cfg parameter. This is a cleanup and only affects the signatures of callbacks, since the parameter hasn't been set since September 2016.

--
MOS_MIGRATED_REVID=140356006

1 files changed, 1 insertions, 9 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkCallbackFunction.java b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkCallbackFunction.java
index 692bd3d14c..ba88b8b024 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkCallbackFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkCallbackFunction.java
@@ -33,15 +33,7 @@ public class SkylarkCallbackFunction {
   }
 
   public ImmutableList<String> getParameterNames() {
-    ImmutableList<String> names = callback.signature.getSignature().getNames();
-    // TODO(fwe): remove this hack once the depot is cleaned up and we no longer have to support
-    // the cfg parameter (also update GoogleSkylarkIntegrationTest).
-    int lastIndex = names.size() - 1;
-    if (lastIndex >= 0 && names.get(lastIndex).equals("cfg")) {
-      names = names.subList(0, lastIndex);
-    }
-
-    return names;
+    return callback.signature.getSignature().getNames();
   }
 
   public Object call(ClassObject ctx, Object... arguments)