From c4925d46845d3f9a9f0edd63e7c6a82d9bf990e6 Mon Sep 17 00:00:00 2001 From: Lukacs Berki Date: Fri, 9 Oct 2015 15:09:36 +0000 Subject: 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 --- .../google/devtools/build/lib/rules/objc/BazelJ2ObjcProtoAspect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main') 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") -- cgit v1.2.3