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

resolved conflicts for merge of 1adaa571 to gingerbread-plus-aosp

Browse Source 
Change-Id: I6c2ea537a9f6dce3c5d54b8c3c720b49058fea68
This commit is contained in:
Raphael
2011-01-27 21:46:19 -08:00
parent b35e113cef 1adaa57108
commit 6a691b3ed8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/tools/patch_windows_sdk.sh
View File

@@ -30,7 +30,7 @@ WIN_OUT_DIR=$2
TOPDIR=${TOPDIR:-$3} TOPDIR=${TOPDIR:-$3}
# The unix2dos is provided by the APT package "tofrodos". However # 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` UNIX2DOS=`which unix2dos`
if [[ ! -x $UNIX2DOS ]]; then if [[ ! -x $UNIX2DOS ]]; then
UNIX2DOS=`which todos` UNIX2DOS=`which todos`
@@ -111,3 +111,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 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 cp -f $V $WIN_OUT_DIR/host/windows-x86/bin/$i $TEMP_SDK_DIR/../$i
done done