Mercurial Mercurial > oss > MCL > sftools > fbf > projects > platforms / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
catchup merge
authorMattD <mattd@symbian.org>
Fri, 20 Nov 2009 17:31:01 +0000
changeset 299 b2d4e75d4645
parent 298 efb6440d30ae (diff)
parent 297 c01205272202 (current diff)
child 300 f95c4ec1153f
catchup merge
--- a/symbian3/split/sources_fcl.csv	Fri Nov 20 17:08:39 2009 +0000
+++ b/symbian3/split/sources_fcl.csv	Fri Nov 20 17:31:01 2009 +0000
@@ -89,6 +89,7 @@
 //v800008/Builds01/mercurial_development/sfl/FCL/sf/mw/uiaccelerator/,/sf/mw/uiaccelerator,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_development/sfl/FCL/sf/mw/uiresources/,/sf/mw/uiresources,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/uitools/,/sf/mw/uitools,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/usbservices/,/sf/mw/usbservices,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/videoutils/,/sf/mw/videoutils,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/vpnclient/,/sf/mw/vpnclient,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/web/,/sf/mw/web,branch,default,layers.sysdef.xml
@@ -101,7 +102,7 @@
 //v800008/Builds01/mercurial_development/sfl/FCL/sf/os/commsfw/,/sf/os/commsfw,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_development/sfl/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_development/sfl/FCL/sf/os/devicesrv/,/sf/os/devicesrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/graphics/,/sf/os/graphics,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/graphics/,/sf/os/graphics,branch,NewGraphicsArchitecture,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/imagingext/,/sf/os/imagingext,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_development/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_development/sfl/FCL/sf/os/lbs/,/sf/os/lbs,branch,default,layers.sysdef.xml
--- a/symbian3/split/sysdefs/system_model_s60.xml	Fri Nov 20 17:08:39 2009 +0000
+++ b/symbian3/split/sysdefs/system_model_s60.xml	Fri Nov 20 17:31:01 2009 +0000
@@ -324,7 +324,10 @@
         <unit unitID="abs.uiresources" mrp="" bldFile="sf/mw/uiresources/group" name="uiresources"/>
       </module>
 <module name="usbservices">
-        <unit unitID="lcdo.usbservices" mrp="" bldFile="\sf\mw\usbservices\group" name="usbservices"/>
+        <unit unitID="lcdo.usbservices" mrp="" bldFile="sf/mw/usbservices/group" name="usbservices"/>
+        <!-- MattD: I really need to FCL the component to Add in a couple of null bld.inf files, but I'll push it a bit further by doing this -->
+        <unit unitID="more.usbservices" mrp="" bldFile="sf/mw/usbservices/usbservices_plat/group" name="usbservices_API"/>
+
       </module>
 <module name="videoutils">
         <unit unitID="vado.videoutils" mrp="" bldFile="sf/mw/videoutils/group" name="videoutils"/>
MCL/sftools/fbf/projects/platforms