diff options
| -rwxr-xr-x | build/tools.windows.atree | 6 | ||||
| -rw-r--r-- | build/windows_sdk_tools.mk | 1 | ||||
| -rw-r--r-- | files/post_tools_install.bat | 9 |
3 files changed, 14 insertions, 2 deletions
diff --git a/build/tools.windows.atree b/build/tools.windows.atree index a7640c2..852d78e 100755 --- a/build/tools.windows.atree +++ b/build/tools.windows.atree @@ -84,9 +84,11 @@ rm tools/zipalign bin/zipalign.exe strip tools/zipalign.exe -# Copy the SDK Manager (aka sdklauncher) to the root of the SDK as well -# as in SDK/tools/lib (so that tools updates can update the root one too) +# Copy the AVD & SDK Manager (aka avd/sdklauncher) to the root of the SDK as +# well as in SDK/tools/lib (so that tools updates can update the root one too) +bin/avdlauncher.exe "AVD Manager.exe" bin/sdklauncher.exe "SDK Manager.exe" +/bin/avdlauncher.exe "tools/lib/AVD Manager.exe" /bin/sdklauncher.exe "tools/lib/SDK Manager.exe" # Supporting bat files diff --git a/build/windows_sdk_tools.mk b/build/windows_sdk_tools.mk index 9f3db4b..a82b2c8 100644 --- a/build/windows_sdk_tools.mk +++ b/build/windows_sdk_tools.mk @@ -4,6 +4,7 @@ # to device which tools we want to build from the sdk.git project. WIN_SDK_TARGETS := \ + avdlauncher \ emulator \ emulator-arm \ emulator-x86 \ diff --git a/files/post_tools_install.bat b/files/post_tools_install.bat index 36e3279..287dbc1 100644 --- a/files/post_tools_install.bat +++ b/files/post_tools_install.bat @@ -30,9 +30,18 @@ rem Change current directory and drive to where the script is, to avoid rem issues with directories containing whitespaces.
cd /d %~dp0
+:Step1
set src=SDK Manager.exe
set dst=..\..\%src%
+if not exist "%src%" goto Step2
+ echo Updating %src%
+ copy /V /Y "%src%" "%dst%"
+
+:Step2
+set src=AVD Manager.exe
+set dst=..\..\%src%
+
if not exist "%src%" goto Cleanup
echo Updating %src%
copy /V /Y "%src%" "%dst%"
|