aboutsummaryrefslogtreecommitdiffstats
path: root/find_java
diff options
context:
space:
mode:
authorRaphael Moll <ralf@android.com>2012-08-16 15:20:43 -0700
committerRaphael Moll <ralf@android.com>2012-08-17 14:28:34 -0700
commit26a423a5de4b715a980a0c0f0a16ec50bf39aef2 (patch)
tree8aa5187f05a90b9c3efab02075ca041462e9609d /find_java
parentf84b9feb3e21022f449812dfa10d1d1a1339683f (diff)
downloadsdk-26a423a5de4b715a980a0c0f0a16ec50bf39aef2.zip
sdk-26a423a5de4b715a980a0c0f0a16ec50bf39aef2.tar.gz
sdk-26a423a5de4b715a980a0c0f0a16ec50bf39aef2.tar.bz2
find_java: wrap toShortPath in disableWow64FSRedirection.
Change-Id: I4e3135927616eb6ad3e0da46496bb97b3029ccd9
Diffstat (limited to 'find_java')
-rw-r--r--find_java/find_java_exe.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/find_java/find_java_exe.cpp b/find_java/find_java_exe.cpp
index c8e0e49..6b1add9 100644
--- a/find_java/find_java_exe.cpp
+++ b/find_java/find_java_exe.cpp
@@ -117,12 +117,15 @@ int main(int argc, char* argv[]) {
_ASSERT(!javaPath.isEmpty());
if (doShortPath) {
+ PVOID oldWow64Value = disableWow64FsRedirection();
if (!javaPath.toShortPath(&javaPath)) {
+ revertWow64FsRedirection(&oldWow64Value);
fprintf(stderr,
"Failed to convert path to a short DOS path: %s\n",
javaPath.cstr());
return 1;
}
+ revertWow64FsRedirection(&oldWow64Value);
}
if (doVersion) {