SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"

Change-Id: Id62b59e75e92fe14376353211dd59d89f4ee63c6

2 files changed, 12 insertions, 6 deletions

diff --git a/files/post_tools_install.bat b/files/post_tools_install.bat
index 94928c6..36e3279 100644
--- a/files/post_tools_install.bat
+++ b/files/post_tools_install.bat
@@ -30,9 +30,15 @@ rem Change current directory and drive to where the script is, to avoid
 rem issues with directories containing whitespaces.

 cd /d %~dp0

 

-set src=SDK Setup.exe

+set src=SDK Manager.exe

 set dst=..\..\%src%

 

-if not exist "%src%" goto :EOF

+if not exist "%src%" goto Cleanup

   echo Updating %src%

-  copy /V /Y "%src%" "%dst%"
\ No newline at end of file
+  copy /V /Y "%src%" "%dst%"

+

+:Cleanup

+set old_dst=..\..\SDK Setup.exe

+if not exist "%old_dst%" goto :EOF

+  echo Removing obsolete %old_dst%

+  del /F /Q "%old_dst%"

diff --git a/sdklauncher/sdklauncher.c b/sdklauncher/sdklauncher.c
index e1d97a1..d3c4445 100644
--- a/sdklauncher/sdklauncher.c
+++ b/sdklauncher/sdklauncher.c
@@ -15,7 +15,7 @@
  */
 
 /*
- * The "SDK Launcher" is for Windows only.
+ * The "SDK Manager" is for Windows only.
  * This simple .exe will sit at the root of the Windows SDK
  * and currently simply executes tools\android.bat.
  * Eventually it should simply replace the batch file.
@@ -65,7 +65,7 @@ void display_error(LPSTR description) {
 
         s2 = (LPSTR) malloc(strlen(description) + strlen(s) + 5);
         sprintf(s2, "%s\r\n%s", description, s);
-        MessageBox(NULL, s2, "Android SDK Setup - Error", MB_OK);
+        MessageBox(NULL, s2, "Android SDK Manager - Error", MB_OK);
         free(s2);
         LocalFree(s);
     }
@@ -168,7 +168,7 @@ void read_temp_file(LPSTR temp_filename) {
                 *s2 = 0;
             }
 
-            MessageBox(NULL, s1, "Android SDK Setup - Output", MB_OK);
+            MessageBox(NULL, s1, "Android SDK Manager - Output", MB_OK);
         }
 
     }