diff options
| author |  Lukacs Berki <lberki@google.com> | 2015-10-09 15:09:36 +0000 |
|---|---|---|
| committer |  Kristina Chodorow <kchodorow@google.com> | 2015-10-09 18:03:52 +0000 |
| commit | c4925d46845d3f9a9f0edd63e7c6a82d9bf990e6 (patch) | |
| tree | 521d8bf00f7ca8c4306cc482f400bfc424f7d3ea /src/main | |
| parent | 47f607ea5df14dd3a385b4ad0371948e9144bbce (diff) | |
Do not change cwd when building J2ObjC protos.
This is superfluous because when an action is executed, the cwd is always the exec root we always pass exec paths on the command line.
This is necessary because this doesn't work if the proto compiler tool is not in the main repository.
--
MOS_MIGRATED_REVID=105057016
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcProtoAspect.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcProtoAspect.java index 2da029c7ad..d557c06fd9 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcProtoAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcProtoAspect.java @@ -85,7 +85,7 @@ public class BazelJ2ObjcProtoAspect extends AbstractJ2ObjcProtoAspect { .setCommandLine(new CustomCommandLine.Builder() .add(compiler.getPath().toString()) .add("-w") - .add(compiler.getRoot().getPath().toString()) + .add(".") // Actions are always run with the exec root as cwd .add("--generate-j2objc") .add("--generator-param=file_dir_mapping") .add("--generator-param=generate_class_mappings") |