From 62437b9984649c80aa3a7d93750efdc5ff206d07 Mon Sep 17 00:00:00 2001 From: Raphael Date: Wed, 14 Oct 2009 06:52:59 -0700 Subject: [PATCH] Windows SDK: copy SDK Setup.exe at root of SDK. Also add a source.properties (we'll install it on the vendor/google script part of the script). SDK BUG 2173135 Change-Id: Icb0f22a65ffd819bf7b0f48adbec51cbc1243f71 --- build/tools/make_windows_sdk.sh | 5 ++++- tools/scripts/usbdriver_source.properties | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100755 tools/scripts/usbdriver_source.properties diff --git a/build/tools/make_windows_sdk.sh b/build/tools/make_windows_sdk.sh index 001ab8cc8..97c7bc77e 100755 --- a/build/tools/make_windows_sdk.sh +++ b/build/tools/make_windows_sdk.sh @@ -99,7 +99,7 @@ function build() { fastboot \ hprof-conv \ mksdcard \ - sqlite3 \ + sdklauncher sqlite3 \ zipalign \ || die "Build failed" } @@ -153,6 +153,9 @@ function package() { 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 000000000..9db385219 --- /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