From 01bf32e9bdf0ecd7c92f062f142dfaa5f4ab0e51 Mon Sep 17 00:00:00 2001 From: ulfjack Date: Thu, 2 Nov 2017 17:50:07 -0400 Subject: Automated rollback of commit 8cb1d2fb460a9caf47df58d7ff051d31080a77cb. *** Reason for rollback *** Roll forward again without the changes to expand_location, but with the trimming fix from https://github.com/bazelbuild/bazel/commit/19617360121635a77ffec99b84d825e7d9b260b1. *** Original change description *** 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: 174384095 --- .../build/lib/analysis/ConfigurationMakeVariableContext.java | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/main/java/com/google/devtools/build/lib/analysis/ConfigurationMakeVariableContext.java') diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfigurationMakeVariableContext.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfigurationMakeVariableContext.java index a5c7cbfb99..f9c170a0e2 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/ConfigurationMakeVariableContext.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfigurationMakeVariableContext.java @@ -105,4 +105,9 @@ public class ConfigurationMakeVariableContext implements TemplateContext { } return SkylarkDict.copyOf(null, map); } + + @Override + public String lookupFunction(String name, String param) throws ExpansionException { + throw new ExpansionException(String.format("$(%s) not defined", name)); + } } -- cgit v1.2.3