am bf281a9a: Merge change 9072 into donut

Merge commit 'bf281a9adef5a7ef342d0e5fb240d719575e5718'

* commit 'bf281a9adef5a7ef342d0e5fb240d719575e5718':
  Make changes to enable driver build in new location
This commit is contained in:
Android (Google) Code Review
2009-07-30 09:57:26 -07:00
committed by Android Git Automerger
2 changed files with 8 additions and 4 deletions

View File

@@ -34,8 +34,13 @@ extern "C" {
#pragma warning(default:4201) #pragma warning(default:4201)
#pragma warning(default:4214) #pragma warning(default:4214)
#include "adb_api_extra.h" // Just to make adb_api.h compile. Since we will not reference any
#include "android_usb_common_defines.h" // of the API routines in the driver, only structures and constants,
// we're fine with that.
typedef void* LPOVERLAPPED;
#include "adb_api.h"
#include "adb_api_legacy.h"
#include "android_usb_pool_tags.h" #include "android_usb_pool_tags.h"
#include "android_usb_driver_defines.h" #include "android_usb_driver_defines.h"
#include "android_usb_new_delete.h" #include "android_usb_new_delete.h"

View File

@@ -40,8 +40,7 @@ USER_C_FLAGS=$(USER_C_FLAGS) /wd4100 /wd4002 /wd4509 /wd4390 /TP
INCLUDES=$(INCLUDES); \ INCLUDES=$(INCLUDES); \
$(IFSKIT_INC_PATH); \ $(IFSKIT_INC_PATH); \
..\common; \ ..\..\api;
..\api;
TARGETLIBS=$(DDK_LIB_PATH)\usbd.lib TARGETLIBS=$(DDK_LIB_PATH)\usbd.lib