LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit 'f08d230ed0d2612e79c121e0afa1e439b5702815' into gingerbread-plus-aosp

* commit 'f08d230ed0d2612e79c121e0afa1e439b5702815':
  SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
This commit is contained in:
Raphael Moll
2010-08-26 09:02:13 -07:00
committed by Android Git Automerger
parent 40ed6797ee f08d230ed0
commit 059e4eb3db
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/tools/make_windows_sdk.sh
View File

@@ -172,10 +172,10 @@ function package() {
mkdir -pv "$LIB"/x86_64
cp -v prebuilt/windows-x86_64/swt/swt.jar "$LIB"/x86_64/
# Copy the SDK Setup (aka sdklauncher) to the root of the SDK (it was copied in tools above)
# Copy the SDK Manager (aka sdklauncher) to the root of the SDK (it was copied in tools above)
# and move it also in SDK/tools/lib (so that tools updates can update the root one too)
cp "$TOOLS/sdklauncher.exe" "$TEMP_SDK_DIR/SDK Setup.exe"
mv "$TOOLS/sdklauncher.exe" "$LIB/SDK Setup.exe"
cp "$TOOLS/sdklauncher.exe" "$TEMP_SDK_DIR/SDK Manager.exe"
mv "$TOOLS/sdklauncher.exe" "$LIB/SDK Manager.exe"
# If you want the emulator NOTICE in the tools dir, uncomment the following line:
# cp -v external/qemu/NOTICE "$TOOLS"/emulator_NOTICE.txt

6
build/tools/patch_windows_sdk.sh
View File

@@ -38,10 +38,10 @@ cp $V ${TOPDIR}prebuilt/windows/swt/swt.jar $LIB/x86/
mkdir -pv $LIB/x86_64
cp $V ${TOPDIR}prebuilt/windows-x86_64/swt/swt.jar $LIB/x86_64/
# Copy the SDK Setup (aka sdklauncher) to the root of the SDK (it was copied in tools above)
# Copy the SDK Manager (aka sdklauncher) to the root of the SDK (it was copied in tools above)
# and move it also in SDK/tools/lib (so that tools updates can update the root one too)
cp $TOOLS/sdklauncher.exe $TEMP_SDK_DIR/"SDK Setup.exe"
mv $TOOLS/sdklauncher.exe $LIB/"SDK Setup.exe"
cp $TOOLS/sdklauncher.exe $TEMP_SDK_DIR/"SDK Manager.exe"
mv $TOOLS/sdklauncher.exe $LIB/"SDK Manager.exe"
# Copy the emulator NOTICE in the tools dir
cp $V ${TOPDIR}external/qemu/NOTICE $TOOLS/emulator_NOTICE.txt