aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2018-06-08 11:09:16 -0700
committerXin Li <delphij@google.com>2018-06-08 11:09:16 -0700
commitabd24e26031666d6a3415b8971ba6b2062cf89f4 (patch)
treef1a9adf12c1a7e744fd98000071ff1cbbe5cee07
parent4536a2b17f5dea6071e704c417a205478037aa02 (diff)
parent82665cde34ff23de36e7be76b714a8516e080902 (diff)
downloadsdk-abd24e26031666d6a3415b8971ba6b2062cf89f4.tar.gz
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Bug: 79597307 Change-Id: I55e2713512e56b2f860f499ed279b8c153068c99
-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) {