diff options
| author | Raphael Moll <raphael@google.com> | 2011-09-17 11:25:36 -0700 |
|---|---|---|
| committer | Raphael <raphael@google.com> | 2011-09-19 12:26:04 -0700 |
| commit | 1e0661b57dd8c7226c50e558dd89ecbda5276ecf (patch) | |
| tree | 1fdafe89636241479c5c74b30a3ec7f7b2f74e70 /build | |
| parent | 9b634c7d1d288d97c25d5d38355139da5f46e0d4 (diff) | |
| download | sdk-1e0661b57dd8c7226c50e558dd89ecbda5276ecf.zip sdk-1e0661b57dd8c7226c50e558dd89ecbda5276ecf.tar.gz sdk-1e0661b57dd8c7226c50e558dd89ecbda5276ecf.tar.bz2 | |
Build AVD Manager.exe as part of Windows SDK.
Also make sure the sdk manager post install will
update the AVD Manager as required.
Change-Id: I969899adf69f0ed0ddb1ef079451683dd0ce567f
Diffstat (limited to 'build')
| -rwxr-xr-x | build/tools.windows.atree | 6 | ||||
| -rw-r--r-- | build/windows_sdk_tools.mk | 1 |
2 files changed, 5 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 \ |