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

Merge change 20484 into donut

Browse Source 
* changes:
  BUG 2039647 : support customization from calling wrapper script.
This commit is contained in:
Android (Google) Code Review
2009-08-07 15:59:51 -07:00
parent 40443d537d bd7dfac5a5
commit 1736f2ce65
1 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
build/tools/make_windows_sdk.sh
View File

@@ -19,25 +19,26 @@ DIST_DIR="$2"
TEMP_DIR="$3" TEMP_DIR="$3"
[ -z "$TEMP_DIR" ] && TEMP_DIR=${TMP:-/tmp} [ -z "$TEMP_DIR" ] && TEMP_DIR=${TMP:-/tmp}
function die() { function die() {
echo "Error:" $* echo "Error:" $*
echo "Aborting" echo "Aborting"
exit 1 exit 1
} }
function usage() { function usage() {
echo "Usage: ${PROG_NAME} linux_or_mac_sdk.zip output_dir [temp_dir]" local NAME
echo "If temp_dir is not given, \$TMP is used. If that's missing, /tmp is used." NAME=`basename ${PROG_NAME}`
status echo "Usage: ${NAME} linux_or_mac_sdk.zip output_dir [temp_dir]"
exit 2 echo "If temp_dir is not given, \$TMP is used. If that's missing, /tmp is used."
status
exit 2
} }
function status() { function status() {
echo "Current values:" echo "Current values:"
echo "- Input SDK: ${SDK_ZIP:-missing}" echo "- Input SDK: ${SDK_ZIP:-missing}"
echo "- Output dir: ${DIST_DIR:-missing}" echo "- Output dir: ${DIST_DIR:-missing}"
echo "- Temp dir: ${TEMP_DIR:-missing}" echo "- Temp dir: ${TEMP_DIR:-missing}"
} }
function check() { function check() {
@@ -114,6 +115,10 @@ function package() {
"Instead found " $THE_PLATFORM "Instead found " $THE_PLATFORM
[[ -d "$PLATFORM_TOOLS" ]] || die "Missing folder $PLATFORM_TOOLS." [[ -d "$PLATFORM_TOOLS" ]] || die "Missing folder $PLATFORM_TOOLS."
# Package USB Driver
if type package_usb_driver 2>&1 | grep -q function ; then
package_usb_driver $TEMP_SDK_DIR
fi
# Remove obsolete stuff from tools & platform # Remove obsolete stuff from tools & platform
TOOLS="$TEMP_SDK_DIR/tools" TOOLS="$TEMP_SDK_DIR/tools"
@@ -190,14 +195,14 @@ function package() {
# Now move the final zip from the temp dest to the final dist dir # Now move the final zip from the temp dest to the final dist dir
mv -v "$TEMP_DIR/$DEST_NAME_ZIP" "$DIST_DIR/$DEST_NAME_ZIP" mv -v "$TEMP_DIR/$DEST_NAME_ZIP" "$DIST_DIR/$DEST_NAME_ZIP"
echo "Done"
echo
echo "Resulting SDK is in $DIST_DIR/$DEST_NAME_ZIP"
# We want fastboot and adb next to the new SDK # We want fastboot and adb next to the new SDK
for i in fastboot.exe adb.exe AdbWinApi.dll; do for i in fastboot.exe adb.exe AdbWinApi.dll; do
mv -vf out/host/windows-x86/bin/$i "$DIST_DIR"/$i mv -vf out/host/windows-x86/bin/$i "$DIST_DIR"/$i
done done
echo "Done"
echo
echo "Resulting SDK is in $DIST_DIR/$DEST_NAME_ZIP"
} }
check check