提交: ff22514931539168e399681a33e40aa62895b827 - development (git)

development

Commit MetaInfo

• 修订版: ff22514931539168e399681a33e40aa62895b827 (tree)
• 时间: 2011-01-30 02:00:30
• 作者: Raphael <raphael@goog...>
• Commiter: Android Git Automerger

Log Message

am b24ee05b: am 6a691b3e: resolved conflicts for merge of 1adaa571 to gingerbread-plus-aosp

* commit 'b24ee05ba02eb77494622680e14352b16da51149':

unix2dos command, used by win SDK, has been renamed under Lucid.

更改概述

• modified: build/tools/patch_windows_sdk.sh

差异

--- a/build/tools/patch_windows_sdk.sh
+++ b/build/tools/patch_windows_sdk.sh
@@ -30,7 +30,7 @@ WIN_OUT_DIR=$2
 TOPDIR=${TOPDIR:-$3}
 
 # The unix2dos is provided by the APT package "tofrodos". However
-# as for ubuntu lucid, the package renamed the command to "todos".
+# as of ubuntu lucid, the package renamed the command to "todos".
 UNIX2DOS=`which unix2dos`
 if [[ ! -x $UNIX2DOS ]]; then
   UNIX2DOS=`which todos`
@@ -115,3 +115,4 @@ ${TOPDIR}sdk/build/patch_windows_sdk.sh $Q ${TEMP_SDK_DIR} ${WIN_OUT_DIR} ${TOPD
 for i in fastboot.exe adb.exe AdbWinApi.dll AdbWinUsbApi.dll; do
     cp -f $V $WIN_OUT_DIR/host/windows-x86/bin/$i $TEMP_SDK_DIR/../$i
 done
+