diff options
| author |  Lukacs Berki <lberki@google.com> | 2016-03-30 10:16:28 +0000 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2016-03-30 10:41:08 +0000 |
| commit | 6766ebbc7be2b296f7861b25b4c8f373a8503ab3 (patch) | |
| tree | ff970c23177fc0015566c5448d531f7ae2a0a4aa /src/main/java/com/google/devtools/build/lib/rules/android | |
| parent | 7914d2a316969a3f7232530c3c195b8de50b5786 (diff) | |
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
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/NativeLibs.java | 3 |
1 files changed, 2 insertions, 1 deletions
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; } |