am 369978fd: am 62437b99: Windows SDK: copy SDK Setup.exe at root of SDK.
Merge commit '369978fd3167a19f3e2e303c8874b66e8429f25f'
* commit '369978fd3167a19f3e2e303c8874b66e8429f25f':
Windows SDK: copy SDK Setup.exe at root of SDK.
diff --git a/build/tools/make_windows_sdk.sh b/build/tools/make_windows_sdk.sh
index 001ab8c..97c7bc7 100755
--- a/build/tools/make_windows_sdk.sh
+++ b/build/tools/make_windows_sdk.sh
@@ -99,7 +99,7 @@
fastboot \
hprof-conv \
mksdcard \
- sqlite3 \
+ sdklauncher sqlite3 \
zipalign \
|| die "Build failed"
}
@@ -153,6 +153,9 @@
mkdir -pv "$LIB"/x86_64
cp -v prebuilt/windows-x86_64/swt/swt.jar "$LIB"/x86_64/
+ # Move the SDK Setup (aka sdklauncher) to the root of the SDK (it was copied in tools above)
+ mv "$TOOLS/sdklauncher.exe" "$TEMP_SDK_DIR/SDK Setup.exe"
+
# If you want the emulator NOTICE in the tools dir, uncomment the following line:
# cp -v external/qemu/NOTICE "$TOOLS"/emulator_NOTICE.txt
diff --git a/tools/scripts/usbdriver_source.properties b/tools/scripts/usbdriver_source.properties
new file mode 100755
index 0000000..9db3852
--- /dev/null
+++ b/tools/scripts/usbdriver_source.properties
@@ -0,0 +1,4 @@
+Pkg.Revision=1
+Archive.Os=WINDOWS
+Archive.Arch=ANY
+Extra.Path=usb_driver