diff options
| author |  ulfjack <ulfjack@google.com> | 2017-11-02 17:50:07 -0400 |
|---|---|---|
| committer |  John Cater <jcater@google.com> | 2017-11-03 09:53:23 -0400 |
| commit | 01bf32e9bdf0ecd7c92f062f142dfaa5f4ab0e51 (patch) | |
| tree | bb1d6a339743f1cacb95c351f1080361f03bf074 /src/main/java/com/google/devtools/build/lib/rules/proto | |
| parent | 479079fe7dd45a1ff99252d02bcffa0bdb7362ef (diff) | |
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
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/proto')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java | 5 |
1 files changed, 5 insertions, 0 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 e0410dbb4d..b91e57f14b 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,6 +205,11 @@ 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, |