Automated rollback of commit ca77f608e486bf7aa762565d25bf7b9e30f2268c.

This also rolls back unknown commit.

*** Reason for rollback ***

Affected expand_location Skylark API semantics - it no longer accepts ${abc} or plain dollar signs, but complains.

*** Original change description ***

Extend TemplateExpander to handle $(func param) expansion

Rewrite the Expander to use the new functionality; also rewrite the Skylark
expand_location function to use it.

PiperOrigin-RevId: 173508888

1 files changed, 0 insertions, 5 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java
index b91e57f14b..e0410dbb4d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java
@@ -205,11 +205,6 @@ public class ProtoCompileActionBuilder {
                 }
                 return value.toString();
               }
-
-              @Override
-              public String lookupFunction(String name, String param) throws ExpansionException {
-                throw new ExpansionException(String.format("$(%s) not defined", name));
-              }
             });
       } catch (ExpansionException e) {
         // Squeelch. We don't throw this exception in the lookupMakeVariable implementation above,