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

Merge change 20765 into donut

Browse Source 
* changes:
  BUG 2033924: Add AdbWinUsbApi.dll to prebuilt for Windows SDK
This commit is contained in:
Android (Google) Code Review
2009-08-11 12:30:37 -07:00
parent c5c912e49b 1620a180c2
commit a901c3d412
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/tools/make_windows_sdk.sh
View File

@@ -195,9 +195,9 @@ 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"
# We want fastboot and adb next to the new SDK # We want fastboot and adb (and its DLLs) next to the new SDK
for i in fastboot.exe adb.exe AdbWinApi.dll; do for i in fastboot.exe adb.exe AdbWinApi.dll AdbWinUsbApi.dll; do
mv -vf out/host/windows-x86/bin/$i "$DIST_DIR"/$i cp -vf out/host/windows-x86/bin/$i "$DIST_DIR"/$i
done done
echo "Done" echo "Done"

3
host/windows/prebuilt/usb/Android.mk
View File

@@ -6,7 +6,8 @@ LOCAL_PREBUILT_LIBS := \
AdbWinApi.a AdbWinApi.a
LOCAL_PREBUILT_EXECUTABLES := \ LOCAL_PREBUILT_EXECUTABLES := \
AdbWinApi.dll AdbWinApi.dll \
AdbWinUsbApi.dll
.PHONY : kill-adb .PHONY : kill-adb