--- a/tsrc/group/bld.inf	Thu Aug 19 10:54:11 2010 +0300
+++ b/tsrc/group/bld.inf	Tue Aug 31 16:13:57 2010 +0300
@@ -20,29 +20,13 @@
 DEFAULT
 
 //build files for Stub Framework
-
-
-//build files for shortlinkconn
-#include "../../../shortlinkconn/localconnectivityservice/lcstylustap/tsrc/LcStylusTapTest/group/bld.inf"
-#include "../../../shortlinkconn/localconnectivityservice/generichid/tsrc/GenericHidTest/group/bld.inf"
-
+#include "../testtools/stubsrv/group/bld.inf"
 //build files for usb
-#include "../../usbuis/usbui/tsrc/USBUiApiTest/group/bld.inf"
-#include "../../usbuis/usbuinotif/tsrc/USBUiNotifApiTest/group/bld.inf"
-
-#include "../../usbclasses/usbhidclassdriver/tsrc/UsbHidClassDriverTest/group/bld.inf"
 #include "../../usbclasses/msmmplugin/tsrc/MsmmPluginTest/group/bld.inf"
-#include "../../usbclasses/usbbasicpersonality/tsrc/UsbBasicPersonalityTest/group/bld.inf"
-//#include "../../usbclasses/usbosdescriptorhandler/tsrc/UsbOsDescriptorHandlerTest/group/bld.inf"
-//#include "../../usbclasses/usbmscpersonality/tsrc/UsbMscPersonalityTest/group/bld.inf"
-#include "../../usbclasses/usbobexclasscontroller/tsrc/UsbObexClassControllerTest/group/bld.inf"
+#include "../../usbuis/usbuinotif/tsrc/USBUiNotifApiTest/group/bld.inf"
+#include "../../usbclasses/usbhidclassdriver/tsrc/UsbHidClassDriverTest/group/bld.inf"
+#include "../../usbengines/usbotgwatcher/tsrc/UsbOtgWatcherTest/group/bld.inf"
 
-//#include "../../usbengines/usbotgwatcher/tsrc/UsbOtgWatcherTest/group/bld.inf"
-#include "../../usbengines/usblocodplugin/tsrc/USBLocodPluginTest/group/bld.inf"
-#include "../../usbengines/usbremotepersonality/tsrc/USBRemotePersonalityTest/group/bld.inf"
-//#include "../../usbengines/usbwatcher/tsrc/UsbWatcherTest/group/bld.inf"
-
-#include "../../usbservices_plat/usb_personality_plugin_api/tsrc/usbpersonalitypluginapitest/group/bld.inf"
 
 PRJ_EXPORTS