symbian3/split/sysdefs/system_model_s60.xml
changeset 192 d16154da298a
parent 187 ae62bd054adc
child 222 2e250f567334
--- a/symbian3/split/sysdefs/system_model_s60.xml	Fri Sep 04 16:15:21 2009 +0100
+++ b/symbian3/split/sysdefs/system_model_s60.xml	Sun Sep 13 17:36:23 2009 +0100
@@ -91,877 +91,443 @@
   cwd CDATA #REQUIRED
   command CDATA #REQUIRED>
 ]>
-<SystemDefinition name="S60_SystemBuild + S60_SystemModel" schema="1.4.0">
+<SystemDefinition name="S60_SystemBuild + sysdef_dtd_1_4_0_xml + devicesync + eas + QuickOffice + adobereader + tfxserver + webvideo + wmdrmkeystorage_dist + wmdrmpd_dist + zipviewer + webservde + oemrndtools + swconfigapps + toolsextensions + avdomain + btaudioadaptation_stub + drm_stub + ocrsrv_stub + omasuplasnconverterstubimpl + posmsgpluginreferenceimpl + power_save_display_mode_stub + srsfenginestub + systemswstubs + tactileclickplugin_stub + wlanhwinit_stub + camera + commonemail + conntools + contacts + contentcontrol + conversations + devicecontrol + systemswextensions + files + gallery + graphicsuis + helps + homescreen + im + imgeditor + imgvieweruis + iptelephony + java + location + messaging + mmsharinguis + avdomain + organizer + phone + photos + printing + profile + radio + rndtools + screensaver + settingsuis + speechsrv + utils + videocenter + videoeditor + avdomain + videotelephony + avdomain + webuis + accesssec + appinstall + appsupport + btservices + camerasrv + classicui + dlnasrv + drm + hapticsservices + avdomain + homescreensrv + imghandling + imsrv + inputmethods + ipappprotocols + ipappservices + ipconnmgmt + legacypresence + locationsrv + mds + messagingmw + metadatasrv + avdomain + avdomain + mmuifw + netprotocols + networkingdm + opensrv + phonesrv + platformtools + remoteconn + remotemgmt + remotestorage + securitysrv + serviceapi + serviceapifw + shortlinkconn + ossrv + svgt + uiaccelerator + uiresources + uitools + usbservices + videoutils + vpnclient + web + websrv + wirelessacc + cellularsrv + S60Extras + devicesrv + graphics + imagingext + lbs + avdomainosext + networkingsrv + osrndtools + ossrv + shortlinksrv + systemswextensions + wlan + xmlsrv + buildplatforms + homescreentools + swconfigtools" schema="1.4.0">
 <systemModel>
-<layer name="os_layer">
-</layer>
-<layer name="SF_SOS">
-<module name="sf_licenseetsystub">
-<component name="sf_licenseetsystub">
-<unit unitID="sf_os_cellularsrv_telephonyserverplugins_licenseetsystub" name="sf_licenseetsystub" bldFile="\sf\os\cellularsrv\telephonyserverplugins\licenseetsystub\group" mrp="" filter="!no_stubs"/>
-</component>
-</module>
-<module name="sf_common_tsy">
-<component name="sf_common_tsy">
-<unit unitID="sf_os_cellularsrv_telephonyserverplugins_common_tsy" name="sf_common_tsy" bldFile="\sf\os\cellularsrv\telephonyserverplugins\common_tsy\group" mrp="" filter=""/>
-</component>
-</module>
-<module name="sf_openvg11">
-<component name="sf_openvg11">
-<unit unitID="sf_os_graphics_openvg_openvginterface_group_openvg11" name="sf_openvg11" bldFile="\sf\os\graphics\openvg\openvginterface\group\openvg11" mrp="" filter=""/>
-</component>
-</module>
-</layer>
-<layer name="sf">
-<logicalset name="adaptation">
-<logicalsubset name="stubs">
-<module name="audiostubs">
-<component name="audiostubs">
-<unit unitID="sf_adaptation_stubs_audiostubs" name="audiostubs" bldFile="\sf\adaptation\stubs\audiostubs\group" mrp="" filter="!no_stubs"/>
-</component>
-</module>
-<module name="btaudioadaptation_stub">
-<component name="btaudioadaptation_stub">
-<unit unitID="sf_adaptation_stubs_btaudioadaptation_stub" name="btaudioadaptation_stub" bldFile="\sf\adaptation\stubs\btaudioadaptation_stub\group" mrp="" filter="!no_stubs"/>
-</component>
-</module>
-<module name="drm_stubs">
-<component name="drm_stubs">
-<unit unitID="sf_adaptation_stubs_drm_stubs" name="drm_stubs" bldFile="\sf\adaptation\stubs\drm_stubs\group" mrp="" filter="!no_stubs"/>
-</component>
-</module>
-<module name="ocrsrv_stub">
-<component name="ocrsrv_stub">
-<unit unitID="sf_adaptation_stubs_ocrsrv_stub" name="ocrsrv_stub" bldFile="\sf\adaptation\stubs\ocrsrv_stub\group" mrp="" filter="!no_stubs"/>
-</component>
-</module>
-<module name="omasuplasnconverterstubimpl">
-<component name="omasuplasnconverterstubimpl">
-<unit unitID="sf_adaptation_stubs_omasuplasnconverterstubimpl" name="omasuplasnconverterstubimpl" bldFile="\sf\adaptation\stubs\omasuplasnconverterstubimpl\group" mrp="" filter="!no_stubs"/>
-</component>
-</module>
-<module name="posmsgpluginreferenceimpl">
-<component name="posmsgpluginreferenceimpl">
-<unit unitID="sf_adaptation_stubs_posmsgpluginreferenceimpl" name="posmsgpluginreferenceimpl" bldFile="\sf\adaptation\stubs\posmsgpluginreferenceimpl\group" mrp="" filter="!no_stubs"/>
-</component>
-</module>
-<module name="power_save_display_mode_stub">
-<component name="power_save_display_mode_stub">
-<unit unitID="sf_adaptation_stubs_power_save_display_mode_stub" name="power_save_display_mode_stub" bldFile="\sf\adaptation\stubs\power_save_display_mode_stub\group" mrp="" filter="!no_stubs"/>
-</component>
-</module>
-<module name="srsfenginestub">
-<component name="srsfenginestub">
-<unit unitID="sf_adaptation_stubs_srsfenginestub" name="srsfenginestub" bldFile="\sf\adaptation\stubs\srsfenginestub\group" mrp="" filter="!no_stubs"/>
-</component>
-</module>
-<module name="systemswstubs">
-<component name="systemswstubs">
-<unit unitID="sf_adaptation_stubs_systemswstubs" name="systemswstubs" bldFile="\sf\adaptation\stubs\systemswstubs\group" mrp="" filter="!no_stubs"/>
-</component>
-</module>
-<module name="tactileclickplugin_stub">
-<component name="tactileclickplugin_stub">
-<unit unitID="sf_adaptation_stubs_tactileclickplugin_stub" name="tactileclickplugin_stub" bldFile="\sf\adaptation\stubs\tactileclickplugin_stub\group" mrp="" filter="!no_stubs"/>
-</component>
-</module>
-<module name="wlanhwinit_stub">
-<component name="wlanhwinit_stub">
-<unit unitID="sf_adaptation_stubs_wlanhwinit_stub" name="wlanhwinit_stub" bldFile="\sf\adaptation\stubs\wlanhwinit_stub\group" mrp="" filter="!no_stubs"/>
-</component>
-</module>
-</logicalsubset>
-</logicalset>
-<logicalset name="app">
-<logicalsubset name="camera">
-<module name="camera">
-<component name="camera">
-<unit unitID="sf_app_camera" name="camera" bldFile="\sf\app\camera\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="commonemail">
-<module name="commonemail">
-<component name="commonemail">
-<unit unitID="sf_app_commonemail" name="commonemail" bldFile="\sf\app\commonemail\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="conntools">
-<module name="conntools">
-<component name="conntools">
-<unit unitID="sf_app_conntools" name="conntools" bldFile="\sf\app\conntools\group" mrp=""/>
-</component>
+	<layer name="os_layer">
+<module name="toolsextensions">
+        <unit unitID="tools.toolsextensions" mrp="" bldFile="ext/tools/toolsextensions/group" name="toolsextensions"/>
+      </module>
+<module name="cellularsrv">
+				<unit name="cellularsrv" unitID="tsydo.cellularsrv" bldFile="sf/os/cellularsrv/group" mrp=""/>       
+       </module>
+<module name="S60Extras">
+        <unit unitID="platform.S60Extras" mrp="" bldFile="sf/os/deviceplatformrelease/S60Extras/group" name="S60Extras"/>
+      </module>
+<module name="S60LocFiles">
+        <unit unitID="platform.S60LocFiles" mrp="" bldFile="sf/os/deviceplatformrelease/S60LocFiles/group" filter="sf_build" name="S60LocFiles"/>
+      </module>
+<module name="version">
+        <unit unitID="platform.version" mrp="" bldFile="sf/os/deviceplatformrelease/Version/group" name="version"/>
+      </module>
+<module name="devicesrv">                                                                                                                            
+        <unit unitID="sydo.devicesrv" mrp="" bldFile="sf/os/devicesrv/group" name="devicesrv"/>                  
+      </module>
+<module name="">
+<unit unitID="tools.osrndtools.osrndtools_plat.hti_api" mrp="" bldFile="sf/os/osrndtools/osrndtools_plat/hti_api/group" filter="sf_build" name="tools_osrndtools_osrndtools_plat_hti_api"/>
+<unit unitID="tools.osrndtools.hti" mrp="" bldFile="sf/os/osrndtools/hti/group" filter="sf_build" name="tools_osrndtools_hti"/></module>
+<module name="graphics">
+        <unit unitID="abs.graphics" mrp="" bldFile="sf/os/graphics/group" name="graphics"/>
+      </module>
+<module name="imagingext">
+        <unit unitID="imm.imagingext" mrp="" bldFile="sf/os/imagingext/group" name="imagingext"/>
+      </module>
+<module name="lbs">
+        <unit unitID="lodo.lbs" mrp="" bldFile="sf/os/lbs/group" name="lodo.lbs"/>
+      </module>
+<module name="mm">
+				<unit unitID="mm" mrp="" bldFile="sf/os/mm/group" name="mm"/>
+			</module>
+<module name="networkingsrv">
+        <unit unitID="netdo.networkingsrv" mrp="" bldFile="sf/os/networkingsrv/group" name="networkingsrv"/>
+      </module>
+<module name="osrndtools">
+        <unit unitID="tools.osrndtools" mrp="" bldFile="sf/os/osrndtools/group" name="osrndtools"/>
+      </module>
+<module name="ossrv">                             
+<unit name="ossrv" unitID="mrtdo.ossrv" bldFile="sf/os/ossrv/group" mrp=""/>
 </module>
-</logicalsubset>
-<logicalsubset name="contacts">
-<module name="contacts">
-<component name="contacts">
-<unit unitID="sf_app_contacts" name="contacts" bldFile="\sf\app\contacts\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="contentcontrol">
-<module name="contentcontrol">
-<component name="contentcontrol">
-<unit unitID="sf_app_contentcontrol" name="contentcontrol" bldFile="\sf\app\contentcontrol\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="conversations">
-<module name="conversations">
-<component name="conversations">
-<unit unitID="sf_app_conversations" name="conversations" bldFile="\sf\app\conversations\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="devicecontrol">
-<module name="devicecontrol">
-<component name="devicecontrol">
-<unit unitID="sf_app_devicecontrol" name="devicecontrol" bldFile="\sf\app\devicecontrol\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="dictionary">
-<module name="dictionary">
-<component name="dictionary">
-<unit unitID="sf_app_dictionary" name="dictionary" bldFile="\sf\app\dictionary\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="files">
-<module name="files">
-<component name="files">
-<unit unitID="sf_app_files" name="files" bldFile="\sf\app\files\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="gallery">
-<module name="gallery">
-<component name="gallery">
-<unit unitID="sf_app_gallery" name="gallery" bldFile="\sf\app\gallery\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="graphicsuis">
-<module name="graphicsuis">
-<component name="graphicsuis">
-<unit unitID="sf_app_graphicsuis" name="graphicsuis" bldFile="\sf\app\graphicsuis\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="helps">
-<module name="helps">
-<component name="helps">
-<unit unitID="sf_app_helps" name="helps" bldFile="\sf\app\helps\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="homescreen">
-<module name="homescreen">
-<component name="homescreen">
-<unit unitID="sf_app_homescreen" name="homescreen" bldFile="\sf\app\homescreen\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="im">
-<module name="im">
-<component name="im">
-<unit unitID="sf_app_im" name="im" bldFile="\sf\app\im\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="imgeditor">
-<module name="imgeditor">
-<component name="imgeditor">
-<unit unitID="sf_app_imgeditor" name="imgeditor" bldFile="\sf\app\imgeditor\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="imgvieweruis">
-<module name="imgvieweruis">
-<component name="imgvieweruis">
-<unit unitID="sf_app_imgvieweruis" name="imgvieweruis" bldFile="\sf\app\imgvieweruis\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="iptelephony">
-<module name="iptelephony">
-<component name="iptelephony">
-<unit unitID="sf_app_iptelephony" name="iptelephony" bldFile="\sf\app\iptelephony\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="java">
-<module name="java_plat">
-<component name="java_plat">
-<unit unitID="sf_app_java_java_plat" name="java_plat" bldFile="\sf\app\java\java_plat\group" mrp=""/>
-</component>
-</module>
-<module name="java_stubs">
-<component name="java_stubs">
-<unit unitID="sf_app_java_java_stubs" name="java_stubs" bldFile="\sf\app\java\java_stubs\group" mrp=""/>
-</component>
+<module name="shortlinksrv">
+        <unit unitID="lcdo.shortlinksrv" mrp="" bldFile="sf/os/shortlinksrv/group" name="shortlinksrv"/>
+      </module>
+<module name="textandloc">
+        <unit unitID="abs.textandloc" mrp="" bldFile="sf/os/textandloc/group" name="textandloc"/>
+      </module>
+<module name="wlan">
+        <unit unitID="netdo.wlan" mrp="" bldFile="sf/os/wlan/group" name="wlan"/>
+      </module>
+<module name="xmlsrv">
+        <unit unitID="WSDo.xmlsrv" mrp="" bldFile="sf/os/xmlsrv/group" name="xmlsrv"/>
+      </module>
+<module name="sf_common_tsy">
+			<component name="sf_common_tsy">
+				<unit unitID="symbian.common_tsy" name="sf_common_tsy" bldFile="\sf\os\cellularsrv\telephonyserverplugins\common_tsy\group" mrp="" filter=""/>
+			</component>
+		</module>
+<module name="sf_openvg11">
+			<component name="sf_openvg11">
+				<unit unitID="symbian.openvg11" name="sf_openvg11" bldFile="\sf\os\graphics\openvg\openvginterface\group\openvg11" mrp="" filter="sf_build"/>
+			</component>
+		</module></layer>
+	<layer name="bldfirst_mw_layer">
+<module name="classicui">
+        <unit unitID="abs.classicui" mrp="" bldFile="sf/mw/classicui/group" name="classicui"/>
+      </module></layer>
+	<layer name="mw_layer">
+<module name="accesssec">
+        <unit unitID="netdo.accesssec" mrp="" bldFile="sf/mw/accesssec/group" name="accesssec"/>
+      </module>
+<module name="appinstall">
+        <unit unitID="sedo.appinstall" mrp="" bldFile="sf/mw/appinstall/group" name="appinstall"/>
+      </module>
+<module name="appsupport">
+        <unit unitID="sydo.appsupport" name="appsupport" bldFile="sf/mw/appsupport/group" mrp=""/>
+      </module>
+<module name="">
+<unit unitID="helix_stub" mrp="" bldFile="sf/mw/mmmw/mmfw/helix_stub/group" filter="sf_build" name="helix_stub"/>
+<unit unitID="sedo.securitysrv.pkiutilities.Certificates" bldFile="sf/mw/securitysrv/pkiutilities/Certificates/group" mrp="" filter="sf_build" name="sedo_securitysrv_pkiutilities_Certificates"/>
 </module>
-</logicalsubset>
-<logicalsubset name="location">
-<module name="location">
-<component name="location">
-<unit unitID="sf_app_location" name="location" bldFile="\sf\app\location\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="messaging">
-<module name="messaging">
-<component name="messaging">
-<unit unitID="sf_app_messaging" name="messaging" bldFile="\sf\app\messaging\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="mmsharinguis">
-<module name="mmsharinguis">
-<component name="mmsharinguis">
-<unit unitID="sf_app_mmsharinguis" name="mmsharinguis" bldFile="\sf\app\mmsharinguis\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="musicplayer">
-<module name="musicplayer">
-<component name="musicplayer">
-<unit unitID="sf_app_musicplayer" name="musicplayer" bldFile="\sf\app\musicplayer\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="organizer">
-<module name="organizer">
-<component name="organizer">
-<unit unitID="sf_app_organizer" name="organizer" bldFile="\sf\app\organizer\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="phone">
-<module name="phone">
-<component name="phone">
-<unit unitID="sf_app_phone" name="phone" bldFile="\sf\app\phone\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="photos">
-<module name="photos">
-<component name="photos">
-<unit unitID="sf_app_photos" name="photos" bldFile="\sf\app\photos\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="poc">
-<module name="poc">
-<component name="poc">
-<unit unitID="sf_app_poc" name="poc" bldFile="\sf\app\poc\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="printing">
-<module name="printing">
-<component name="printing">
-<unit unitID="sf_app_printing" name="printing" bldFile="\sf\app\printing\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="profile">
-<module name="profile">
-<component name="profile">
-<unit unitID="sf_app_profile" name="profile" bldFile="\sf\app\profile\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="radio">
-<module name="radio">
-<component name="radio">
-<unit unitID="sf_app_radio" name="radio" bldFile="\sf\app\radio\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="rndtools">
-<module name="rndtools">
-<component name="rndtools">
-<unit unitID="sf_app_rndtools" name="rndtools" bldFile="\sf\app\rndtools\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="screensaver">
-<module name="screensaver">
-<component name="screensaver">
-<unit unitID="sf_app_screensaver" name="screensaver" bldFile="\sf\app\screensaver\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="settingsuis">
-<module name="settingsuis">
-<component name="settingsuis">
-<unit unitID="sf_app_settingsuis" name="settingsuis" bldFile="\sf\app\settingsuis\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="speechsrv">
-<module name="speechsrv">
-<component name="speechsrv">
-<unit unitID="sf_app_speechsrv" name="speechsrv" bldFile="\sf\app\speechsrv\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="utils">
-<module name="utils">
-<component name="utils">
-<unit unitID="sf_app_utils" name="utils" bldFile="\sf\app\utils\group" mrp=""/>
-</component>
+<module name="btservices">
+        <unit unitID="lcdo.btservices" mrp="" bldFile="\sf\mw\btservices\group" name="btservices"/>
+      </module>
+<module name="camerasrv">
+        <unit unitID="imm.camerasrv" mrp="" bldFile="sf/mw/camerasrv/group" name="camerasrv"/>
+      </module>
+<module name="dlnasrv">
+        <unit name="homemedia" unitID="hcdo.homemedia" bldFile="sf/mw/dlnasrv/homemedia/group" mrp=""/>
+        <unit name="homesync" unitID="hcdo.homesync" bldFile="sf/mw/dlnasrv/homesync/group" mrp=""/>
+        <unit name="upnpavcontrolpoint" unitID="hcdo.upnpavcontrolpoint" bldFile="sf/mw/dlnasrv/upnpavcontrolpoint/group" mrp=""/>
+        <unit name="upnpframework" unitID="hcdo.upnpframework" bldFile="sf/mw/dlnasrv/upnpframework/group" mrp=""/>
+        <unit name="upnpharvester" unitID="hcdo.upnpharvester" bldFile="sf/mw/dlnasrv/upnpharvester/group" mrp=""/>
+        <unit name="upnpmediaserver" unitID="hcdo.upnpmediaserver" bldFile="sf/mw/dlnasrv/upnpmediaserver/group" mrp=""/>
+        <unit name="upnpavcontroller" unitID="hcdo.upnpavcontroller" bldFile="sf/mw/dlnasrv/upnpavcontroller/group" mrp=""/>
+        <unit name="upnpsharing" unitID="hcdo.upnpsharing" bldFile="sf/mw/dlnasrv/upnpsharing/group" mrp=""/>
+        <unit name="upnpsettings" unitID="hcdo.upnpsettings" bldFile="sf/mw/dlnasrv/upnpsettings/group" mrp=""/>
+        <unit name="upnpmpxplugins" unitID="hcdo.upnpmpxplugins" bldFile="sf/mw/dlnasrv/upnpmpxplugins/group" mrp=""/>
+        <unit name="dlnasrv_plat" unitID="hcdo.dlnasrv_plat" bldFile="sf/mw/dlnasrv/dlnasrv_plat/group" mrp=""/>
+      </module>
+<module name="drm">
+        <unit unitID="sedo.drm" mrp="" bldFile="sf/mw/drm/group" name="drm"/>
+      </module>
+<module name="hapticsservices">
+        <unit unitID="abs.hapticsservices" mrp="" bldFile="sf/mw/hapticsservices/group" name="hapticsservices"/>
+      </module>
+<module name="homescreensrv">
+        <unit unitID="hs.homescreensrv" mrp="" bldFile="sf/mw/homescreensrv/group" name="homescreensrv"/>
+      </module>
+<module name="imghandling">
+        <unit unitID="imm.imghandling" mrp="" bldFile="sf/mw/imghandling/group" name="imghandling"/>
+      </module>
+<module name="imsrv">
+        <unit unitID="MeCodo.imsrv" mrp="" bldFile="sf/mw/imsrv/group" name="imsrv"/>
+      </module>
+<module name="inputmethods">
+        <unit unitID="abs.inputmethods" mrp="" bldFile="sf/mw/inputmethods/group" name="inputmethods"/>
+      </module>
+<module name="ipappprotocols">
+  		<unit unitID="ipappprotocol" name="ipappprotocol" bldFile="\sf\mw\ipappprotocols\group" mrp=""/> 
+      </module>
+<module name="ipappsrv">
+  		<unit unitID="ipappsrv" name="ipappservice" bldFile="\sf\mw\ipappsrv\group" mrp=""/> 
+      </module>
+<module name="ipconnmgmt">
+        <unit unitID="netdo.ipconnmgmt" mrp="" bldFile="sf/mw/ipconnmgmt/group" name="ipconnmgmt"/>
+      </module>
+<module name="legacypresence">
+        <unit unitID="presdo.legacypresence" mrp="" bldFile="sf/mw/legacypresence/group" name="legacypresence"/>
+      </module>
+<module name="locationsrv">
+        <unit unitID="lodo.locationsrv" mrp="" bldFile="sf/mw/locationsrv/group" name="locationsrv"/>
+      </module>
+<module name="mds">
+        <unit unitID="imm.mds" mrp="" bldFile="sf/mw/mds/group" name="mds"/>
+      </module>
+<module name="messagingmw">
+        <unit unitID="Medo.messagingmw" mrp="" bldFile="sf/mw/messagingmw/group" name="messagingmw"/>
+      </module>
+<module name="metadatasrv">
+        <unit unitID="imm.metadatasrv" mrp="" bldFile="sf/mw/metadatasrv/group" name="metadatasrv"/>
+      </module>
+<module name="mmappfw">
+				<unit unitID="mmappfw" mrp="" bldFile="sf/mw/mmappfw/group" name="mmappfw"/>
+			</module>
+<module name="mmmw">
+				<unit unitID="mmmw" mrp="" bldFile="sf/mw/mmmw/group" name="mmmw"/>
+			</module>
+<module name="mmuifw">
+        <unit unitID="uxdo.mmuifw" mrp="" bldFile="sf/mw/mmuifw/group" name="mmuifw"/>
+      </module>
+<module name="netprotocols">
+	    <unit unitID="browsing_domain.netprotocols" mrp="" bldFile="sf/mw/netprotocols/group" name="netprotocols"/>
+      </module>
+<module name="networkingdm">
+        <unit unitID="netdo.networkingdm" mrp="" bldFile="sf/mw/networkingdm/group" name="networkingdm"/>
+      </module>
+<module name="opensrv">
+        <unit unitID="MeCodo.opensrv" mrp="" bldFile="sf/mw/opensrv/group" name="opensrv"/>
+      </module>
+<module name="phonesrv">
+	      <unit name="phonesrv_plat" unitID="tedo.phonesrv_plat" bldFile="sf/mw/phonesrv/phonesrv_plat/group" mrp=""/>
+        <unit name="phonesrv_pub" unitID="tedo.phonesrv_pub" bldFile="sf/mw/phonesrv/phonesrv_pub/group" mrp=""/>
+        <unit name="CbsServer" unitID="tedo.CbsServer" bldFile="sf/mw/phonesrv/cbs/CbsServer/group" mrp=""/>
+        <unit name="cbsui" unitID="tedo.cbsui" bldFile="sf/mw/phonesrv/cbs/cbsui/group" mrp=""/>
+        <unit name="convergedcallengine" unitID="tedo.convergedcallengine" bldFile="sf/mw/phonesrv/convergedcallengine/group" mrp=""/>
+        <unit name="networkhandlingengine" unitID="tedo.networkhandlingengine" bldFile="sf/mw/phonesrv/networkhandling/networkhandlingengine/group" mrp=""/>
+        <unit name="aiwdialdata" unitID="tedo.aiwdialdata" bldFile="sf/mw/phonesrv/phoneclientserver/aiwdialdata/group" mrp=""/>
+        <unit name="CallUI" unitID="tedo.CallUI" bldFile="sf/mw/phonesrv/phoneclientserver/CallUI/group" mrp=""/>
+        <unit name="dialutils" unitID="tedo.dialutils" bldFile="sf/mw/phonesrv/phoneclientserver/dialutils/group" mrp=""/>
+        <unit name="EnPolicy" unitID="tedo.EnPolicy" bldFile="sf/mw/phonesrv/phoneclientserver/EnPolicy/group" mrp=""/>
+        <unit name="phoneclient" unitID="tedo.phoneclient" bldFile="sf/mw/phonesrv/phoneclientserver/phoneclient/group" mrp=""/>
+        <unit name="phoneserver" unitID="tedo.phoneserver" bldFile="sf/mw/phonesrv/phoneclientserver/phoneserver/group" mrp=""/>
+        <unit name="SatServer" unitID="tedo.SatServer" bldFile="sf/mw/phonesrv/satengine/SatServer/group" mrp=""/>
+        <unit name="satapp" unitID="tedo.satapp" bldFile="sf/mw/phonesrv/satui/satapp/group" mrp=""/>
+        <unit name="satplugin" unitID="tedo.satplugin" bldFile="sf/mw/phonesrv/satui/satplugin/group" mrp=""/>
+        <unit name="phoneparser" unitID="tedo.phoneparser" bldFile="sf/mw/phonesrv/telutils/phoneparser/group" mrp=""/>
+				<unit name="telephonyservice" unitID="tedo.telephonyservice" bldFile="sf/mw/phonesrv/telutils/telephonyservice/group" mrp=""/>
+        <unit name="telephonysettings" unitID="tedo.telephonysettings" bldFile="sf/mw/phonesrv/cellular/telephonysettings/group" mrp=""/>
+        <unit name="sssettings" unitID="tedo.sssettings" bldFile="sf/mw/phonesrv/cellular/sssettings/group" mrp=""/>
+        <unit name="psetnotesui" unitID="tedo.psetnotesui" bldFile="sf/mw/phonesrv/cellular/psetnotesui/group" mrp=""/>
+        <unit name="servicerequest" unitID="tedo.servicerequest" bldFile="sf/mw/phonesrv/cellular/servicerequest/group" mrp=""/>
+				<unit name="phonecmdhnlr" unitID="tedo.phonecmdhnlr" bldFile="sf/mw/phonesrv/phonecmdhandler/phonecmdhnlr/group" mrp=""/>
+				<unit name="vmbxengine" unitID="tedo.vmbxengine" bldFile="sf/mw/phonesrv/engines/vmbxengine/group" mrp=""/>
+      </module>
+<module name="platformtools">
+        <unit unitID="tools.platformtools" mrp="" bldFile="sf/mw/platformtools/group" name="platformtools"/>
+      </module>
+<module name="remoteconn">
+        <unit name="remoteconn" unitID="sydo.remoteconn" bldFile="sf/mw/remoteconn/group" mrp=""/>
+      </module>
+<module name="remotemgmt">
+        <unit unitID="spdo.remotemgmt" mrp="" bldFile="sf/mw/remotemgmt/group" name="remotemgmt"/>
+      </module>
+<module name="remotestorage">
+        <unit unitID="presdo.remotestorage" mrp="" bldFile="sf/mw/remotestorage/group" name="remotestorage"/>
+      </module>
+<module name="securitysrv">
+        <unit name="securitysrv" unitID="sedo.securitysrv" bldFile="sf/mw/securitysrv/group" mrp=""/>
+      </module>
+<module name="serviceapi">                             
+<unit name="serviceapi" unitID="sapido.serviceapi" bldFile="sf/mw/serviceapi/group" mrp=""/>
 </module>
-</logicalsubset>
-<logicalsubset name="videocenter">
-<module name="videocenter">
-<component name="videocenter">
-<unit unitID="sf_app_videocenter" name="videocenter" bldFile="\sf\app\videocenter\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="videoeditor">
-<module name="videoeditor">
-<component name="videoeditor">
-<unit unitID="sf_app_videoeditor" name="videoeditor" bldFile="\sf\app\videoeditor\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="videoplayer">
-<module name="videoplayer">
-<component name="videoplayer">
-<unit unitID="sf_app_videoplayer" name="videoplayer" bldFile="\sf\app\videoplayer\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="videotelephony">
-<module name="videotelephony">
-<component name="videotelephony">
-<unit unitID="sf_app_videotelephony" name="videotelephony" bldFile="\sf\app\videotelephony\group" mrp=""/>
-</component>
-</module>
-<module name="vtprotocolsstub">
-<component name="vtprotocolsstub">
-<unit unitID="sf_app_videotelephony_vtprotocolsstub" name="vtprotocolsstub" bldFile="\sf\app\videotelephony\vtprotocolsstub\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="voicerec">
-<module name="voicerec">
-<component name="voicerec">
-<unit unitID="sf_app_voicerec" name="voicerec" bldFile="\sf\app\voicerec\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="webuis">
-<module name="webuis">
-<component name="webuis">
-<unit unitID="sf_app_webuis" name="webuis" bldFile="\sf\app\webuis\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-</logicalset>
-<logicalset name="mw">
-<logicalsubset name="accesssec">
-<module name="accesssec">
-<component name="accesssec">
-<unit unitID="sf_mw_accesssec" name="accesssec" bldFile="\sf\mw\accesssec\group" mrp=""/>
-</component>
+<module name="serviceapifw">                             
+<unit name="serviceapifw" unitID="sapido.serviceapifw" bldFile="sf/mw/serviceapifw/group" mrp=""/>
 </module>
-</logicalsubset>
-<logicalsubset name="appinstall">
-<module name="appinstall">
-<component name="appinstall">
-<unit unitID="sf_mw_appinstall" name="appinstall" bldFile="\sf\mw\appinstall\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="appsupport">
-<module name="appsupport">
-<component name="appsupport">
-<unit unitID="sf_mw_appsupport" name="appsupport" bldFile="\sf\mw\appsupport\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="camerasrv">
-<module name="camerasrv">
-<component name="camerasrv">
-<unit unitID="sf_mw_camerasrv" name="camerasrv" bldFile="\sf\mw\camerasrv\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="classicui">
-<module name="classicui">
-<component name="classicui">
-<unit unitID="sf_mw_classicui" name="classicui" bldFile="\sf\mw\classicui\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="dlnasrv">
-<module name="dlnasrv">
-<component name="dlnasrv">
-<unit unitID="sf_mw_dlnasrv" name="dlnasrv" bldFile="\sf\mw\dlnasrv\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="drm">
-<module name="drm">
-<component name="drm">
-<unit unitID="sf_mw_drm" name="drm" bldFile="\sf\mw\drm\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="hapticsservices">
-<module name="hapticsservices">
-<component name="hapticsservices">
-<unit unitID="sf_mw_hapticsservices" name="hapticsservices" bldFile="\sf\mw\hapticsservices\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="homescreensrv">
-<module name="homescreensrv">
-<component name="homescreensrv">
-<unit unitID="sf_mw_homescreensrv" name="homescreensrv" bldFile="\sf\mw\homescreensrv\group" mrp=""/>
-</component>
+<module name="shortlinkconn">
+        <unit unitID="lcdo.shortlinkconn" mrp="" bldFile="\sf\mw\shortlinkconn\group" name="shortlinkconn"/>
+      </module>
+<module name="upnp">                             
+<unit name="upnp" unitID="mrtdo.upnp" bldFile="sf/mw/srvdiscovery/upnp/group" mrp=""/>
 </module>
-</logicalsubset>
-<logicalsubset name="imghandling">
-<module name="imghandling">
-<component name="imghandling">
-<unit unitID="sf_mw_imghandling" name="imghandling" bldFile="\sf\mw\imghandling\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="imsrv">
-<module name="imsrv">
-<component name="imsrv">
-<unit unitID="sf_mw_imsrv" name="imsrv" bldFile="\sf\mw\imsrv\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="inputmethods">
-<module name="inputmethods">
-<component name="inputmethods">
-<unit unitID="sf_mw_inputmethods" name="inputmethods" bldFile="\sf\mw\inputmethods\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="ipappprotocols">
-<module name="ipappprotocols">
-<component name="ipappprotocols">
-<unit unitID="sf_mw_ipappprotocols" name="ipappprotocols" bldFile="\sf\mw\ipappprotocols\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="ipappsrv">
-<module name="ipappsrv">
-<component name="ipappsrv">
-<unit unitID="sf_mw_ipappsrv" name="ipappsrv" bldFile="\sf\mw\ipappsrv\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="ipconnmgmt">
-<module name="ipconnmgmt">
-<component name="ipconnmgmt">
-<unit unitID="sf_mw_ipconnmgmt" name="ipconnmgmt" bldFile="\sf\mw\ipconnmgmt\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="legacypresence">
-<module name="legacypresence">
-<component name="legacypresence">
-<unit unitID="sf_mw_legacypresence" name="legacypresence" bldFile="\sf\mw\legacypresence\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="locationsrv">
-<module name="locationsrv">
-<component name="locationsrv">
-<unit unitID="sf_mw_locationsrv" name="locationsrv" bldFile="\sf\mw\locationsrv\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="mds">
-<module name="mds">
-<component name="mds">
-<unit unitID="sf_mw_mds" name="mds" bldFile="\sf\mw\mds\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="messagingmw">
-<module name="messagingmw">
-<component name="messagingmw">
-<unit unitID="sf_mw_messagingmw" name="messagingmw" bldFile="\sf\mw\messagingmw\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="metadatasrv">
-<module name="metadatasrv">
-<component name="metadatasrv">
-<unit unitID="sf_mw_metadatasrv" name="metadatasrv" bldFile="\sf\mw\metadatasrv\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="mmappfw">
-<module name="mmappfw">
-<component name="mmappfw">
-<unit unitID="sf_mw_mmappfw" name="mmappfw" bldFile="\sf\mw\mmappfw\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="mmmw">
-<module name="mmmw">
-<component name="mmmw">
-<unit unitID="sf_mw_mmmw" name="mmmw" bldFile="\sf\mw\mmmw\group" mrp=""/>
-</component>
-</module>
-<module name="mmfw">
-<component name="helix_stub">
-<unit unitID="sf_mw_mmmw_mmfw_helix_stub" name="helix_stub" bldFile="\sf\mw\mmmw\mmfw\helix_stub\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="mmuifw">
-<module name="mmuifw">
-<component name="mmuifw">
-<unit unitID="sf_mw_mmuifw" name="mmuifw" bldFile="\sf\mw\mmuifw\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="mobiletv">
-<module name="mobiletv">
-<component name="mobiletv">
-<unit unitID="sf_mw_mobiletv" name="mobiletv" bldFile="\sf\mw\mobiletv\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="netprotocols">
-<module name="netprotocols">
-<component name="netprotocols">
-<unit unitID="sf_mw_netprotocols" name="netprotocols" bldFile="\sf\mw\netprotocols\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="networkingdm">
-<module name="networkingdm">
-<component name="networkingdm">
-<unit unitID="sf_mw_networkingdm" name="networkingdm" bldFile="\sf\mw\networkingdm\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="opensrv">
-<module name="opensrv">
-<component name="opensrv">
-<unit unitID="sf_mw_opensrv" name="opensrv" bldFile="\sf\mw\opensrv\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="phonesrv">
-<module name="phonesrv">
-<component name="phonesrv">
-<unit unitID="sf_mw_phonesrv" name="phonesrv" bldFile="\sf\mw\phonesrv\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="platformtools">
-<module name="platformtools">
-<component name="platformtools">
-<unit unitID="sf_mw_platformtools" name="platformtools" bldFile="\sf\mw\platformtools\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="remoteconn">
-<module name="remoteconn">
-<component name="remoteconn">
-<unit unitID="sf_mw_remoteconn" name="remoteconn" bldFile="\sf\mw\remoteconn\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="remotemgmt">
-<module name="remotemgmt">
-<component name="remotemgmt">
-<unit unitID="sf_mw_remotemgmt" name="remotemgmt" bldFile="\sf\mw\remotemgmt\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="remotestorage">
-<module name="remotestorage">
-<component name="remotestorage">
-<unit unitID="sf_mw_remotestorage" name="remotestorage" bldFile="\sf\mw\remotestorage\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="securitysrv">
-<module name="securitysrv">
-<component name="securitysrv">
-<unit unitID="sf_mw_securitysrv" name="securitysrv" bldFile="\sf\mw\securitysrv\group" mrp=""/>
-</component>
-</module>
-<module name="pkiutilities">
-<component name="Certificates">
-<unit unitID="sf_mw_securitysrv_pkiutilities_Certificates" name="Certificates" bldFile="\sf\mw\securitysrv\pkiutilities\Certificates\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="serviceapi">
-<module name="serviceapi">
-<component name="serviceapi">
-<unit unitID="sf_mw_serviceapi" name="serviceapi" bldFile="\sf\mw\serviceapi\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="serviceapifw">
-<module name="serviceapifw">
-<component name="serviceapifw">
-<unit unitID="sf_mw_serviceapifw" name="serviceapifw" bldFile="\sf\mw\serviceapifw\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="shortlinkconn">
-<module name="shortlinkconn">
-<component name="shortlinkconn">
-<unit unitID="sf_mw_shortlinkconn" name="shortlinkconn" bldFile="\sf\mw\shortlinkconn\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="svgt">
 <module name="svgt">
-<component name="svgt">
-<unit unitID="sf_mw_svgt" name="svgt" bldFile="\sf\mw\svgt\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="uiaccelerator">
+        <unit unitID="abs.svgt" mrp="" bldFile="sf/mw/svgt/group" name="svgt"/>
+      </module>
 <module name="uiaccelerator">
-<component name="uiaccelerator">
-<unit unitID="sf_mw_uiaccelerator" name="uiaccelerator" bldFile="\sf\mw\uiaccelerator\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="uiresources">
+        <unit unitID="abs.uiaccelerator" mrp="" bldFile="sf/mw/uiaccelerator/group" name="uiaccelerator"/>
+      </module>
 <module name="uiresources">
-<component name="uiresources">
-<unit unitID="sf_mw_uiresources" name="uiresources" bldFile="\sf\mw\uiresources\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="uitools">
-<module name="uitools">
-<component name="uitools">
-<unit unitID="sf_mw_uitools" name="uitools" bldFile="\sf\mw\uitools\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="videoutils">
+        <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"/>
+      </module>
 <module name="videoutils">
-<component name="videoutils">
-<unit unitID="sf_mw_videoutils" name="videoutils" bldFile="\sf\mw\videoutils\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="vpnclient">
-<module name="vpnclient">
-<component name="vpnclient">
-<unit unitID="sf_mw_vpnclient" name="vpnclient" bldFile="\sf\mw\vpnclient\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="web">
+        <unit unitID="vado.videoutils" mrp="" bldFile="sf/mw/videoutils/group" name="videoutils"/>
+      </module>
+<module name="vpnclient"> 
+     	<unit unitID="netdo.vpnclient" mrp="" bldFile="sf/mw/vpnclient/group" filter="!oem_build" name="vpnclient"/>
+     </module>
 <module name="web">
-<component name="web">
-<unit unitID="sf_mw_web" name="web" bldFile="\sf\mw\web\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="websrv">
+	    <unit unitID="browsing_domain.web" mrp="" bldFile="sf/mw/web/group" name="web"/>
+      </module>
 <module name="websrv">
-<component name="websrv">
-<unit unitID="sf_mw_websrv" name="websrv" bldFile="\sf\mw\websrv\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="wirelessacc">
+        <unit unitID="WSDo.websrv" mrp="" bldFile="sf/mw/websrv/group" name="websrv"/>        
+      </module>
 <module name="wirelessacc">
-<component name="wirelessacc">
-<unit unitID="sf_mw_wirelessacc" name="wirelessacc" bldFile="\sf\mw\wirelessacc\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-</logicalset>
-<logicalset name="os">
-<logicalsubset name="cellularsrv">
-<module name="basebandabstraction">
-<component name="basebandabstraction">
-<unit unitID="sf_os_cellularsrv_basebandabstraction" name="basebandabstraction" bldFile="\sf\os\cellularsrv\basebandabstraction\group" mrp=""/>
-</component>
-</module>
-<module name="cellularsrv_plat">
-<component name="primary_pdp_context_qos_parameter_setting_api">
-<unit unitID="sf_os_cellularsrv_cellularsrv_plat_primary_pdp_context_qos_parameter_setting_api" name="primary_pdp_context_qos_parameter_setting_api" bldFile="\sf\os\cellularsrv\cellularsrv_plat\primary_pdp_context_qos_parameter_setting_api\group" mrp=""/>
-</component>
-</module>
-<module name="commonnetworkinterface">
-<component name="commonnetworkinterface">
-<unit unitID="sf_os_cellularsrv_commonnetworkinterface" name="commonnetworkinterface" bldFile="\sf\os\cellularsrv\commonnetworkinterface\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="deviceplatformrelease">
-<module name="S60Extras">
-<component name="S60Extras">
-<unit unitID="sf_os_deviceplatformrelease_S60Extras" name="S60Extras" bldFile="\sf\os\deviceplatformrelease\S60Extras\group" mrp=""/>
-</component>
-</module>
-<module name="S60LocFiles">
-<component name="S60LocFiles">
-<unit unitID="sf_os_deviceplatformrelease_S60LocFiles" name="S60LocFiles" bldFile="\sf\os\deviceplatformrelease\S60LocFiles\group" mrp=""/>
-</component>
-</module>
-<module name="Version">
-<component name="Version">
-<unit unitID="sf_os_deviceplatformrelease_Version" name="Version" bldFile="\sf\os\deviceplatformrelease\Version\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="devicesrv">
-<module name="devicesrv">
-<component name="devicesrv">
-<unit unitID="sf_os_devicesrv" name="devicesrv" bldFile="\sf\os\devicesrv\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="graphics">
-<module name="graphics">
-<component name="graphics">
-<unit unitID="sf_os_graphics" name="graphics" bldFile="\sf\os\graphics\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="imagingext">
-<module name="imagingext">
-<component name="imagingext">
-<unit unitID="sf_os_imagingext" name="imagingext" bldFile="\sf\os\imagingext\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<module name="lbs">
-<component name="lbs">
-<unit unitID="sf_os_lbs" name="lbs" bldFile="\sf\os\lbs\group" mrp=""/>
-</component>
-</module>
-<logicalsubset name="mm">
-<module name="mm">
-<component name="mm">
-<unit unitID="sf_os_mm" name="mm" bldFile="\sf\os\mm\group" mrp=""/>
-</component>
-</module>
-<module name="devsoundextensions">
-<component name="addeddevsoundcontrol">
-<unit unitID="sf_os_mm_devsoundextensions_addeddevsoundcontrol" name="addeddevsoundcontrol" bldFile="\sf\os\mm\devsoundextensions\addeddevsoundcontrol\Group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="networkingsrv">
-<module name="networkingsrv">
-<component name="networkingsrv">
-<unit unitID="sf_os_networkingsrv" name="networkingsrv" bldFile="\sf\os\networkingsrv\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="osrndtools">
-<module name="osrndtools">
-<component name="osrndtools">
-<unit unitID="sf_os_osrndtools" name="osrndtools" bldFile="\sf\os\osrndtools\group" mrp=""/>
-</component>
-</module>
-<module name="hti">
-<component name="hti">
-<unit unitID="sf_os_osrndtools_hti" name="hti" bldFile="\sf\os\osrndtools\hti\group" mrp=""/>
-</component>
-</module>
-<module name="osrndtools_plat">
-<component name="hti_api">
-<unit unitID="sf_os_osrndtools_osrndtools_plat_hti_api" name="hti_api" bldFile="\sf\os\osrndtools\osrndtools_plat\hti_api\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="ossrv">
-<module name="ossrv">
-<component name="ossrv">
-<unit unitID="sf_os_ossrv" name="ossrv" bldFile="\sf\os\ossrv\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="shortlinksrv">
-<module name="shortlinksrv">
-<component name="shortlinksrv">
-<unit unitID="sf_os_shortlinksrv" name="shortlinksrv" bldFile="\sf\os\shortlinksrv\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="textandloc">
-<module name="textandloc">
-<component name="textandloc">
-<unit unitID="sf_os_textandloc" name="textandloc" bldFile="\sf\os\textandloc\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="wlan">
-<module name="wlan">
-<component name="wlan">
-<unit unitID="sf_os_wlan" name="wlan" bldFile="\sf\os\wlan\group" mrp=""/>
-</component>
-</module>
-<module name="wlan_bearer">
-<component name="wlanengine_symbian_3.1">
-<unit unitID="sf_os_wlan_wlan_bearer_wlanengine_symbian_3.1" name="wlanengine_symbian_3.1" bldFile="\sf\os\wlan\wlan_bearer\wlanengine\wlan_symbian\wlanengine_symbian_3.1\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="xmlsrv">
-<module name="xmlsrv">
-<component name="xmlsrv">
-<unit unitID="sf_os_xmlsrv" name="xmlsrv" bldFile="\sf\os\xmlsrv\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-</logicalset>
-<logicalset name="tools">
-<module name="buildplatforms">
-<component name="buildplatforms">
-<unit unitID="sf_tools_buildplatforms" name="buildplatforms" bldFile="\sf\tools\buildplatforms\group" mrp=""/>
-</component>
-</module>
-<logicalsubset name="homescreentools">
+        <unit unitID="netdo.wirelessacc" mrp="" bldFile="sf/mw/wirelessacc/group" name="wirelessacc"/>
+      </module></layer>
+	<layer name="bldfirst_app_layer">
+<module name="contacts">
+        <unit unitID="contacts" mrp="" bldFile="sf/app/contacts/group" name="contacts"/>
+      </module></layer>
+	<layer name="app_layer">
+<module name="oemrndtools">
+        <unit unitID="tools.oemrndtools" mrp="" bldFile="ext/tools/oemrndtools/group" name="oemrndtools"/>
+      </module>
+<module name="">
+<unit unitID="java.java.java_plat" mrp="" bldFile="sf/app/java/java_plat/group" filter="sf_build" name="java_java_plat"/>
+<unit unitID="java.java.java_stubs" mrp="" bldFile="sf/app/java/java_stubs/group" filter="sf_build" name="java_java_stubs"/>
+<unit unitID="tools.rndtools.htiui" mrp="" bldFile="sf/app/rndtools/htiui/group" filter="sf_build" name="tools_rndtools_htiui"/></module>
+<module name="swconfigapps">
+        <unit unitID="tools.swconfigapps" mrp="" bldFile="ext/tools/swconfigapps/group" name="swconfigapps"/>
+      </module>
+<module name="camera">
+        <unit unitID="imm.camera" mrp="" bldFile="sf/app/camera/group" name="camera"/>
+        <unit unitID="imm.camera.help" mrp="" bldFile="sf/app/camera/camerauis/cameraapp/help/group" name="camera_help"/>
+      </module>
+<module name="commonemail">
+        <unit unitID="EDo.commonemail" mrp="" bldFile="sf/app/commonemail/group" name="commonemail"/>
+      </module>
+<module name="conntools">
+        <unit unitID="netdo.conntools" mrp="" bldFile="sf/app/conntools/group" name="conntools"/>
+      </module>
+<module name="contentcontrol">
+        <unit unitID="spdo.contentcontrol" mrp="" bldFile="sf/app/contentcontrol/group" name="contentcontrol"/>
+      </module>
+<module name="conversations">
+        <unit unitID="MeCodo.conversations" mrp="" bldFile="sf/app/conversations/group" name="conversations"/>
+      </module>
+<module name="devicecontrol">
+        <unit unitID="spdo.devicecontrol" mrp="" bldFile="sf/app/devicecontrol/group" name="devicecontrol"/>
+      </module>
+<module name="dictionary">
+        <unit unitID="abs.dictionary" mrp="" bldFile="sf/app/dictionary/group" name="dictionary"/>
+      </module>
+<module name="files">
+        <unit name="files" unitID="sydo.files" bldFile="sf/app/files/group" mrp=""/>
+      </module>
+<module name="gallery">
+        <unit unitID="imm.gallery" mrp="" bldFile="sf/app/gallery/group" name="gallery"/>
+      </module>
+<module name="graphicsuis">
+        <unit unitID="abs.graphicsuis" mrp="" bldFile="sf/app/graphicsuis/group" name="graphicsuis"/>
+      </module>
+<module name="helps">
+        <unit unitID="abs.helps" mrp="" bldFile="sf/app/helps/group" name="helps"/>
+      </module>
+<module name="homescreen">
+        <unit unitID="abs.homescreen" mrp="" bldFile="sf/app/homescreen/group" name="homescreen"/>
+      </module>
+<module name="im">
+        <unit unitID="impp.im" mrp="" bldFile="sf/app/im/group" name="im"/>
+      </module>
+<module name="imgeditor">
+        <unit unitID="imm.imgeditor" mrp="" bldFile="sf/app/imgeditor/group" name="imgeditor"/>
+      </module>
+<module name="imgvieweruis">
+        <unit unitID="imm.imgvieweruis" mrp="" bldFile="sf/app/imgvieweruis/group" name="imgvieweruis"/>
+      </module>
+<module name="iptelephony">
+        <unit name="iptelephony" unitID="te.iptelephony" bldFile="sf/app/iptelephony/group" mrp=""/>
+      </module>
+<module name="location">
+        <unit unitID="lodo.location" mrp="" bldFile="sf/app/location/group" name="location"/>
+      </module>
+<module name="messaging">
+        <unit unitID="Medo.messaging" mrp="" bldFile="sf/app/messaging/group" name="messaging"/>
+      </module>
+<module name="mmsharinguis">
+  		<unit unitID="msdo.mmsharinguis" name="mmsharinguis" bldFile="\sf\app\mmsharinguis\group" mrp=""/> 
+      </module>
+<module name="musicplayer">
+				<unit unitID="musicplayer" mrp="" bldFile="sf/app/musicplayer/group" name="musicplayer"/>
+			</module>
+<module name="organizer">
+        <unit unitID="orgdo.organizer" mrp="" bldFile="sf/app/organizer/group" name="organizer"/>
+      </module>
+<module name="phone">
+        <unit name="phone" unitID="tedo.phone" bldFile="sf/app/phone/group" mrp=""/>
+      </module>
+<module name="photos">
+        <unit unitID="uxdo.photos" mrp="" bldFile="sf/app/photos/group" name="photos"/>
+      </module>
+<module name="printing">
+        <unit unitID="lcdo.printing" mrp="" bldFile="sf/app/printing/group" name="printing"/>
+      </module>
+<module name="profile">
+        <unit name="profile" unitID="presdo.profile" bldFile="sf/app/profile/group" mrp=""/>
+      </module>
+<module name="radio">
+        <unit unitID="vado.radio" mrp="" bldFile="sf/app/radio/group" name="radio"/>
+      </module>
+<module name="rndtools">
+        <unit unitID="tools.rndtools" mrp="" bldFile="sf/app/rndtools/group" name="rndtools"/>
+      </module>
+<module name="screensaver">
+        <unit unitID="abs.screensaver" mrp="" bldFile="sf/app/screensaver/group" name="screensaver"/>
+      </module>
+<module name="settingsuis">
+      <unit name="settingsuis" unitID="presdo.settingsuis" bldFile="sf/app/settingsuis/group" mrp=""/>
+      </module>
+<module name="speechsrv">
+        <unit unitID="MuiDo.speechsrv" mrp="" bldFile="sf/app/speechsrv/group" name="speechsrv"/>
+      </module>
+<module name="utils">
+        <unit unitID="orgdo.utils" mrp="" bldFile="sf/app/utils/group" name="utils"/>
+      </module>
+<module name="videocenter">
+        <unit unitID="vado.videocenter" mrp="" bldFile="sf/app/videocenter/group" name="videocenter"/>
+      </module>
+<module name="videoeditor">
+        <unit unitID="imm.videoeditor" mrp="" bldFile="sf/app/videoeditor/group" name="videoeditor"/>
+      </module>
+<module name="videoplayer">
+				<unit unitID="videoplayer" mrp="" bldFile="sf/app/videoplayer/group" name="videoplayer"/>
+			</module>
+<module name="videotelephony">
+        <unit name="videotelephony_plat" unitID="tedo.videotelephony_plat" bldFile="sf/app/videotelephony/videotelephony_plat/group" mrp=""/>
+        <unit name="vtprotocolsstub" unitID="tedo.vtprotocolsstub" bldFile="sf/app/videotelephony/vtprotocolsstub/group" mrp="" filter="sf_build"/>  
+        <unit name="DisplaySink" unitID="tedo.DisplaySink" bldFile="sf/app/videotelephony/vtprotocolplugins/DisplaySink/group" mrp=""/> 
+        <unit name="VideoSource" unitID="tedo.VideoSource" bldFile="sf/app/videotelephony/vtprotocolplugins/VideoSource/group" mrp=""/>
+        <unit name="videoteleng" unitID="tedo.videoteleng" bldFile="sf/app/videotelephony/vtengines/videoteleng/Group" mrp=""/>  
+        <unit name="videotelui" unitID="tedo.videotelui" bldFile="sf/app/videotelephony/vtuis/videotelui/group" mrp=""/> 
+	<unit name="vtmediatorplugin" unitID="tedo.vtmediatorplugin" bldFile="sf/app/videotelephony/vtengines/vtmediatorplugin/group" mrp=""/>
+      </module>
+<module name="voicerec">
+				<unit unitID="voicerec" mrp="" bldFile="sf/app/voicerec/group" name="voicerec"/>
+			</module>
+<module name="webuis">
+	    <unit unitID="browsing_domain.webuis" mrp="" bldFile="sf/app/webuis/group" name="webuis"/>
+      </module></layer>
+	<layer name="tools_layer">
+<module name="uitools">
+        <unit unitID="abs.uitools" mrp="" bldFile="sf/mw/uitools/group" name="uitools"/>
+      </module>
 <module name="homescreentools">
-<component name="homescreentools">
-<unit unitID="sf_tools_homescreentools" name="homescreentools" bldFile="\sf\tools\homescreentools\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-<logicalsubset name="swconfigtools">
+        <unit unitID="abs.homescreentools" mrp="" bldFile="sf/tools/homescreentools/group" name="homescreentools"/>
+      </module>
 <module name="swconfigtools">
-<component name="swconfigtools">
-<unit unitID="sf_tools_swconfigtools" name="swconfigtools" bldFile="\sf\tools\swconfigtools\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-</logicalset>
-</layer>
-<layer name="ext">
-<logicalset name="tools">
-<logicalsubset name="toolsextensions">
-<module name="toolsextensions">
-<component name="toolsextensions">
-<unit unitID="ext_tools_toolsextensions" name="toolsextensions" bldFile="\ext\tools\toolsextensions\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-</logicalset>
-</layer></systemModel>
+        <unit name="swconfigtools" unitID="sydo.swconfigtools" bldFile="sf/tools/swconfigtools/group" mrp=""/>
+      </module></layer>
+	<layer name="stubs_layer">
+<module name="audiostubs">
+				<unit unitID="audiostubs" mrp="" bldFile="sf/adaptation/stubs/audiostubs/group" name="audiostubs"/>
+			</module>
+<module name="drm_stubs">
+        <unit name="drm_stubs" unitID="sedo.drm_stubs" bldFile="sf/adaptation/stubs/drm_stubs/group" mrp=""/>
+      </module>
+<module name="ocrsrv_stub">
+        <unit unitID="abs.ocrsrv_stub" mrp="" bldFile="sf/adaptation/stubs/ocrsrv_stub/group" filter="!dfs_build" name="ocrsrv_stub"/>
+      </module>
+<module name="omasuplasnconverterstubimpl">
+        <unit unitID="lodo.omasuplasnconverterstubimpl" mrp="" bldFile="sf/adaptation/stubs/omasuplasnconverterstubimpl/group" filter="!dfs_build" name="omasuplasnconverterstubimpl"/>
+      </module>
+<module name="posmsgpluginreferenceimpl">
+        <unit unitID="lodo.posmsgpluginreferenceimpl" mrp="" bldFile="sf/adaptation/stubs/posmsgpluginreferenceimpl/group" name="posmsgpluginreferenceimpl"/>
+      </module>
+<module name="power_save_display_mode_stub">
+        <unit unitID="abs.power_save_display_mode_stub" mrp="" bldFile="sf/adaptation/stubs/power_save_display_mode_stub/group" name="power_save_display_mode_stub"/>
+      </module>
+<module name="systemswstubs">
+  	<unit name="systemswstubs" unitID="sydo.systemswstubs" bldFile="sf/adaptation/stubs/systemswstubs/group" mrp=""/>
+      </module>
+<module name="tactileclickplugin_stub">
+        <unit unitID="abs.tactileclickplugin_stub" mrp="" bldFile="sf/adaptation/stubs/tactileclickplugin_stub/group" name="tactileclickplugin_stub"/>
+      </module>
+<module name="wlanhwinit_stub">
+        <unit unitID="netdo.wlanhwinit_stub" mrp="" bldFile="sf/adaptation/stubs/wlanhwinit_stub/group" name="wlanhwinit_stub"/>
+      </module>
+<module name="sf_licenseetsystub">
+			<component name="sf_licenseetsystub">
+				<unit unitID="symbian.licenseetsystub" name="sf_licenseetsystub" bldFile="\sf\os\cellularsrv\telephonyserverplugins\licenseetsystub\group" mrp="" filter=""/>
+			</component>
+		</module></layer>
+<layer name="unit_test_layer">
+      <module name="camera_unit_tests">
+      </module>
+<module name="gallery_unit_tests">
+      </module>
+<module name="imgeditor_unit_tests">
+    </module>
+<module name="videoeditor_unit_tests">
+      </module>
+<module name="camerasrv_unit_tests">
+      </module>
+<module name="imagehandling_unit_tests">
+    </module>
+<module name="mds_unit_tests">
+      </module>
+<module name="metadatasrv_unit_tests">
+      </module></layer>
+</systemModel>
   <build>
     <option name="KEEPGOING" abldOption="-keepgoing" description="Causes make to keepgoing on errors" enable="Y"/>
 <!--    <option name="SAVESPACE" abldOption="-savespace" description="Causes the removal of intermediate files" enable="Y"/> -->
@@ -989,13 +555,14 @@
     <targetList name="tools_rel" description="tools Release Targets" target="TOOLS_REL"/>
     <targetList name="cwtools" description="cwtools Targets" target="CWTOOLS"/>
     <targetList name="cwtools_rel" description="cwtools Release Targets" target="CWTOOLS_REL"/>
-		<configuration name="S60_5_1_sf" description="S60 5.1 clean build" filter="raptor_S60_5_1_sf">
-    	<unitListRef unitList="S60_COMMON_OSEXTENSION"/>
-      <unitListRef unitList="S60_COMMON"/>
-      <unitListRef unitList="S60_SF_BUILD"/>
-      <unitListRef unitList="S60_COMMON_OSEXTENSION_STUBS"/>
-      <unitListRef unitList="S60_COMMON_STUBS"/>
-      <unitListRef unitList="S60_BINARY_ONLY_SF"/>
+		<configuration name="S60_sf" description="S60 sf build" filter="sf_build">
+<layerRef layerName="os_layer"/>
+<layerRef layerName="bldfirst_mw_layer"/>
+<layerRef layerName="mw_layer"/>
+<layerRef layerName="bldfirst_app_layer"/>
+<layerRef layerName="app_layer"/>
+<layerRef layerName="tools_layer"/>
+<layerRef layerName="stubs_layer"/>
       <task><buildLayer command="bldmake bldfiles" unitParallel="Y"/></task>
       <task><buildLayer command="abld export" unitParallel="Y"/></task>
       <task><buildLayer command="abld makefile" targetList="default_tools" unitParallel="Y" targetParallel="Y"/></task>
@@ -1020,159 +587,5 @@
 this configuration can be used only when those components has built among normal build
 -->
 <!--  OS Extension build configurations start  -->
-    <unitList name="S60_COMMON_OSEXTENSION" description="S60 common OSExtension">
-				<unitRef unit="sf_os_cellularsrv_telephonyserverplugins_common_tsy"/>
-        <unitRef unit="sf_os_deviceplatformrelease_S60Extras"/>   			
-        <unitRef unit="sf_os_deviceplatformrelease_Version"/>
-				<unitRef unit="sf_os_devicesrv"/>
-				<unitRef unit="sf_os_graphics"/>
-				<unitRef unit="sf_os_imagingext"/>
-				<unitRef unit="sf_os_lbs"/>
-				<unitRef unit="sf_os_mm"/>
-				<unitRef unit="sf_os_networkingsrv"/>
-				<unitRef unit="sf_os_mm_devsoundextensions_addeddevsoundcontrol"/>
-				<unitRef unit="sf_os_shortlinksrv"/>
-				<unitRef unit="sf_os_wlan"/>
-				<unitRef unit="sf_os_osrndtools"/>
-			</unitList>
-    <unitList name="S60_COMMON" description="S60 common">
-				<unitRef unit="sf_mw_classicui"/>
-				<unitRef unit="sf_mw_accesssec"/>
-				<unitRef unit="sf_mw_appinstall"/>
-				<unitRef unit="sf_mw_appsupport"/>
-				<unitRef unit="sf_mw_camerasrv"/>
-				<unitRef unit="sf_mw_dlnasrv"/>
-				<unitRef unit="sf_mw_drm"/>
-				<unitRef unit="sf_mw_homescreensrv"/>
-				<unitRef unit="sf_mw_imghandling"/>
-				<unitRef unit="sf_mw_imsrv"/>
-				<unitRef unit="sf_mw_inputmethods"/>
-				<unitRef unit="sf_mw_ipappprotocols"/>
-				<unitRef unit="sf_mw_ipappsrv"/>
-				<unitRef unit="sf_mw_ipconnmgmt"/>
-				<unitRef unit="sf_mw_legacypresence"/>
-				<unitRef unit="sf_mw_locationsrv"/>
-				<unitRef unit="sf_mw_mds"/>
-				<unitRef unit="sf_mw_messagingmw"/>
-				<unitRef unit="sf_mw_metadatasrv"/>
-				<unitRef unit="sf_mw_mmappfw"/>
-				<unitRef unit="sf_mw_mmmw"/>
-				<unitRef unit="sf_mw_mmuifw"/>
-				<unitRef unit="sf_mw_mobiletv"/>
-				<unitRef unit="sf_mw_netprotocols"/>
-				<unitRef unit="sf_mw_networkingdm"/>
-				<unitRef unit="sf_mw_opensrv"/>
-				<unitRef unit="sf_mw_phonesrv"/>
-				<unitRef unit="sf_mw_remoteconn"/>
-				<unitRef unit="sf_mw_remotemgmt"/>
-				<unitRef unit="sf_mw_remotestorage"/>
-				<unitRef unit="sf_mw_securitysrv"/>
-				<unitRef unit="sf_mw_serviceapi"/>
-				<unitRef unit="sf_mw_serviceapifw"/>
-				<unitRef unit="sf_mw_shortlinkconn"/>
-				<unitRef unit="sf_mw_svgt"/>
-				<unitRef unit="sf_mw_uiaccelerator"/>
-				<unitRef unit="sf_mw_uiresources"/>
-				<unitRef unit="sf_mw_uitools"/>
-				<unitRef unit="sf_mw_videoutils"/>
-				<unitRef unit="sf_mw_web"/>
-				<unitRef unit="sf_mw_websrv"/>
-				<unitRef unit="sf_mw_wirelessacc"/>
-				<unitRef unit="sf_app_camera"/>
-				<unitRef unit="sf_app_conntools"/>
-				<unitRef unit="sf_app_screensaver"/>
-				<unitRef unit="sf_app_contacts"/>
-				<unitRef unit="sf_app_contentcontrol"/>
-				<unitRef unit="sf_app_conversations"/>
-				<unitRef unit="sf_app_devicecontrol"/>
-				<unitRef unit="sf_app_dictionary"/>
-				<unitRef unit="sf_app_files"/>
-				<unitRef unit="sf_app_graphicsuis"/>
-				<unitRef unit="sf_app_helps"/>
-				<unitRef unit="sf_app_homescreen"/>
-				<unitRef unit="sf_app_im"/>
-				<unitRef unit="sf_app_imgeditor"/>
-				<unitRef unit="sf_app_imgvieweruis"/>
-				<unitRef unit="sf_app_iptelephony"/>
-				<unitRef unit="sf_app_location"/>
-				<unitRef unit="sf_app_messaging"/>
-				<unitRef unit="sf_app_mmsharinguis"/>
-				<unitRef unit="sf_app_musicplayer"/>
-				<unitRef unit="sf_app_organizer"/>
-				<unitRef unit="sf_app_phone"/>
-				<unitRef unit="sf_app_photos"/>
-				<unitRef unit="sf_app_poc"/>
-				<unitRef unit="sf_app_profile"/>
-				<unitRef unit="sf_app_settingsuis"/>
-				<unitRef unit="sf_app_speechsrv"/>
-				<unitRef unit="sf_app_utils"/>
-				<unitRef unit="sf_app_videoeditor"/>
-				<unitRef unit="sf_app_videoplayer"/>
-				<unitRef unit="sf_app_videocenter"/>
-				<unitRef unit="sf_app_videotelephony"/>
-				<unitRef unit="sf_app_voicerec"/>
-				<unitRef unit="sf_app_webuis"/>
-				<unitRef unit="sf_os_textandloc"/>
-				<unitRef unit="sf_os_xmlsrv"/>
-				<unitRef unit="sf_os_ossrv"/>
-				<unitRef unit="sf_tools_buildplatforms"/>
-				<!--unitRef unit="sf_tools_build_s60"/>
-				<unitRef unit="sf_tools_makefile_templates"/-->
-				<unitRef unit="sf_mw_platformtools"/>
-				<!--unitRef unit="sf_tools_platsim"/-->
-				<unitRef unit="sf_app_rndtools"/>
-				<unitRef unit="sf_tools_swconfigtools"/>
-				<unitRef unit="sf_tools_themeinstaller"/>
-				<unitRef unit="ext_tools_toolsextensions"/>
-				<unitRef unit="sf_tools_homescreentools"/>
-				<unitRef unit="sf_app_commonemail"/>
-				<unitRef unit="sf_app_radio"/>
-				<unitRef unit="sf_app_printing"/>
-				<unitRef unit="sf_mw_hapticsservices"/>
-				<unitRef unit="sf_app_gallery"/>
-    </unitList>
-    <unitList name="S60_SF_BUILD" description="S60 SF build">
-    		<unitRef unit="sf_os_deviceplatformrelease_S60LocFiles"/>   			
-				<unitRef unit="sf_mw_mmmw_mmfw_helix_stub"/>
-				<unitRef unit="sf_mw_securitysrv_pkiutilities_Certificates"/>
-				<unitRef unit="sf_mw_vpnclient"/>
-				<unitRef unit="sf_app_videotelephony_vtprotocolsstub"/>
-				<unitRef unit="sf_app_java_java_plat"/>
-				<unitRef unit="sf_app_java_java_stubs"/>
-				<unitRef unit="sf_os_cellularsrv_commonnetworkinterface"/>
-				<unitRef unit="sf_os_cellularsrv_basebandabstraction"/>
-				<unitRef unit="sf_os_cellularsrv_cellularsrv_plat_primary_pdp_context_qos_parameter_setting_api"/>
-				<unitRef unit="sf_tools_rndtools_htiui"/>
-				<unitRef unit="sf_os_osrndtools_osrndtools_plat_hti_api"/>
-				<unitRef unit="sf_os_osrndtools_hti"/>
-				<unitRef unit="sf_os_graphics_openvg_openvginterface_group_openvg11"/>
-    </unitList>
-    <unitList name="S60_COMMON_OSEXTENSION_STUBS" description="S60 common OSExtension">
-    	<unitRef unit="sf_os_cellularsrv_telephonyserverplugins_licenseetsystub"/>
-    	<unitRef unit="sf_adaptation_stubs_audiostubs"/>
-    	<unitRef unit="sf_adaptation_stubs_wlanhwinit_stub"/>
-			<unitRef unit="sf_adaptation_stubs_systemswstubs"/>
-    </unitList>
-    <unitList name="S60_COMMON_STUBS" description="S60 common adaptation stubs">
-			<unitRef unit="sf_adaptation_stubs_btaudioadaptation_stub"/>
-			<unitRef unit="sf_adaptation_stubs_drm_stubs"/>
-			<unitRef unit="sf_adaptation_stubs_posmsgpluginreferenceimpl"/>
-			<unitRef unit="sf_adaptation_stubs_srsfenginestub"/>
-			<unitRef unit="sf_adaptation_stubs_ocrsrv_stub"/>
-			<unitRef unit="sf_adaptation_stubs_power_save_display_mode_stub"/>
-			<unitRef unit="sf_adaptation_stubs_tactileclickplugin_stub"/>
-			<unitRef unit="sf_adaptation_stubs_omasuplasnconverterstubimpl"/>			
-    </unitList>
-<!--    
-binary only are components that sources can not be delivered for all lisencees
-but components should be built in S60 platform builds
--->
-    <unitList name="S60_BINARY_ONLY_SF" description="S60 build binary only components">
-      <unitRef unit="sf_os_wlan_wlan_bearer_wlanengine_symbian_3.1"/>
-      <unitRef unit="sf_mw_accesssec_eapol_eapol_symbian_ccxeapol"/>
-    </unitList>
-    <!--
-    extra components need to be build in winscw build
-    -->
   </build>
 </SystemDefinition>
\ No newline at end of file