aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2018-08-07 16:51:29 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-08-07 16:51:29 +0000
commitfec4f7d58d66c266fa11fa79efe31d150e2f5e27 (patch)
treea02a84f28530ec3b2c5041c125b2f22a3f77dec4
parent21b5f6fef124e14b612b506620ea5c8addde0536 (diff)
parent07f8b62039189b9712882e7e215d227d62b0979c (diff)
downloadplatform_sdk-fec4f7d58d66c266fa11fa79efe31d150e2f5e27.tar.gz
platform_sdk-fec4f7d58d66c266fa11fa79efe31d150e2f5e27.tar.bz2
platform_sdk-fec4f7d58d66c266fa11fa79efe31d150e2f5e27.zip
Merge "Merge Android Pie into master"android-o-mr1-iot-release-1.0.3
-rw-r--r--find_java/src/source/find_java_exe.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/find_java/src/source/find_java_exe.cpp b/find_java/src/source/find_java_exe.cpp
index 50ca0247d..a8be377ef 100644
--- a/find_java/src/source/find_java_exe.cpp
+++ b/find_java/src/source/find_java_exe.cpp
@@ -63,9 +63,9 @@ static int showHelpMessage() {
static void printError(const char *message) {
- CString error;
- error.setLastWin32Error(message);
- printf(error.cstr());
+ CString error;
+ error.setLastWin32Error(message);
+ printf(error.cstr());
}
static void testFindJava(bool isJdk, int minVersion) {
@@ -182,9 +182,9 @@ int main(int argc, char* argv[]) {
}
if (version == 0) {
- CString s;
- s.setf("Failed to find Java %d.%d (or newer) on your system. ", JAVA_MAJOR(minVersion),
- JAVA_MINOR(minVersion));
+ CString s;
+ s.setf("Failed to find Java %d.%d (or newer) on your system. ", JAVA_MAJOR(minVersion),
+ JAVA_MINOR(minVersion));
if (gIsDebug) {
fprintf(stderr, s.cstr());
@@ -200,8 +200,8 @@ int main(int argc, char* argv[]) {
if (doShortPath) {
if (!javaPath.toShortPath(&javaPath)) {
- CString s;
- s.setf("Failed to convert path (%s) to a short DOS path. ", javaPath.cstr());
+ CString s;
+ s.setf("Failed to convert path (%s) to a short DOS path. ", javaPath.cstr());
fprintf(stderr, s.cstr());
if (shouldPrintError) {