From 6766ebbc7be2b296f7861b25b4c8f373a8503ab3 Mon Sep 17 00:00:00 2001 From: Lukacs Berki Date: Wed, 30 Mar 2016 10:16:28 +0000 Subject: Use the local shell environment for invoking build-runfiles. This is necessary because build-runfiles depends on the msys shared library, which (as per DLL lookup rules on Windows) is checked under the entries of PATH. -- MOS_MIGRATED_REVID=118556684 --- .../java/com/google/devtools/build/lib/rules/android/NativeLibs.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/android') diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/NativeLibs.java b/src/main/java/com/google/devtools/build/lib/rules/android/NativeLibs.java index e11ff8ecfc..78c8db2cde 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/NativeLibs.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/NativeLibs.java @@ -163,7 +163,8 @@ public final class NativeLibs { nativeLibsMiddleman, outputManifest, false, - ruleContext.getConfiguration().getShExecutable())); + ruleContext.getConfiguration().getShExecutable(), + ruleContext.getConfiguration().getLocalShellEnvironment())); return outputManifest; } -- cgit v1.2.3