# HG changeset patch
# User Pat Downey <patd@symbian.org>
# Date 1275480427 -3600
# Node ID 5ebc046f87781d397acef0da7481626360540bb2
# Parent  fc7ff76b57b1a41497a41fe73658352879f2ee81# Parent  cf2e20ee40730ce243c1b19b484716bbe5c9ea97
Merge foundation sbs config and __WINDOWS_MEDIA definition fix.

diff -r cf2e20ee4073 -r 5ebc046f8778 foundation_system/system_model/system_definition.xml
--- a/foundation_system/system_model/system_definition.xml	Fri May 28 16:05:57 2010 +0100
+++ b/foundation_system/system_model/system_definition.xml	Wed Jun 02 13:07:07 2010 +0100
@@ -107,7 +107,7 @@
       <package id="ossrv" level="services" tech-domain="hb" href="../../../../os/ossrv/package_definition.xml"/>
       <package id="security" level="services" tech-domain="se" href="../../../../os/security/package_definition.xml"/>
       <package id="persistentdata" level="services" tech-domain="hb" href="../../../../os/persistentdata/package_definition.xml"/>
-      <package id="devicesrv" level="services" tech-domain="hb" href="../../../../os/devicesrv/package_definition_v2.xml"/>
+      <package id="devicesrv" level="services" tech-domain="hb" href="../../../../os/devicesrv/package_definition.xml"/>
       <package id="lbs" level="services" tech-domain="lo" href="../../../../os/lbs/package_definition.xml"/>
       <package id="commsfw" level="services" tech-domain="dc" href="../../../../os/commsfw/package_definition.xml"/>
       <package id="networkingsrv" level="services" tech-domain="dc" href="../../../../os/networkingsrv/package_definition.xml"/>
@@ -117,7 +117,7 @@
       <package id="usb" level="services" tech-domain="de" href="../../../../os/usb/package_definition.xml"/> 
       <package id="mm" level="services" tech-domain="mm" href="../../../../os/mm/package_definition.xml"/>
       <package id="imagingext" level="services" tech-domain="mm" href="../../../../os/imagingext/package_definition.xml"/>
-      <package id="graphics" level="services" tech-domain="ui" href="../../../../os/graphics/package_definition_v2.xml"/>
+      <package id="graphics" level="services" tech-domain="ui" href="../../../../os/graphics/package_definition.xml"/>
       <package id="textandloc" level="services" tech-domain="ui" href="../../../../os/textandloc/package_definition.xml"/>
       <package id="xmlsrv" level="services" tech-domain="rt" href="../../../../os/xmlsrv/package_definition.xml"/>
       <package id="deviceplatformrelease" level="services" tech-domain="to" href="../../../../os/deviceplatformrelease/package_definition.xml"/>
@@ -165,7 +165,7 @@
       <package id="hapticsservices" level="generic" tech-domain="ui" href="../../../../mw/hapticsservices/package_definition.xml"/>
       <package id="gsprofilesrv" level="generic" tech-domain="ui" href="../../../../mw/gsprofilesrv/package_definition.xml"/>
       <package id="homescreensrv" level="specific" tech-domain="ui" href="../../../../mw/homescreensrv/package_definition.xml"/>
-      <package id="appinstall" level="generic" tech-domain="rt" href="../../../../mw/appinstall/package_definition_v2.xml"/>
+      <package id="appinstall" level="generic" tech-domain="rt" href="../../../../mw/appinstall/package_definition.xml"/>
       <package id="serviceapifw" level="specific" tech-domain="rt" href="../../../../mw/serviceapifw/package_definition.xml"/>
       <package id="serviceapi" level="specific" tech-domain="rt" href="../../../../mw/serviceapi/package_definition.xml"/>
       <package id="web" level="specific" tech-domain="rt" href="../../../../mw/web/package_definition.xml"/>
@@ -215,7 +215,7 @@
       <package id="conntools" level="services" tech-domain="dc" href="../../../../app/conntools/package_definition.xml"/>
       <package id="rndtools" level="services" tech-domain="to" href="../../../../app/rndtools/package_definition.xml"/>
       <package id="helps" level="apps" span="2" tech-domain="ui" href="../../../../app/helps/package_definition.xml"/>
-      <package id="techview" level="apps" span="2" tech-domain="ui" href="../../../../app/techview/package_definition_v2.xml"/>
+      <package id="techview" level="apps" span="2" tech-domain="ui" href="../../../../app/techview/package_definition.xml"/>
     </layer>
   </systemModel>
 </SystemDefinition>
diff -r cf2e20ee4073 -r 5ebc046f8778 symbianosbld/productionbldcbrconfig/Future/AutoCBR_Future_test_export.csv
--- a/symbianosbld/productionbldcbrconfig/Future/AutoCBR_Future_test_export.csv	Fri May 28 16:05:57 2010 +0100
+++ b/symbianosbld/productionbldcbrconfig/Future/AutoCBR_Future_test_export.csv	Wed Jun 02 13:07:07 2010 +0100
@@ -36,7 +36,8 @@
 networking_qoslib,B D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 
 # non-standard source code will not be delivered as beinG O Tagged as cat. B, but we need to deliver the cat B exports,,,
-graphics_itype,E(B) D E F G O T,E(B) D E F G O T,A B D E F G O T,A B D E F G O T
+#tls_itype,E(B) D E F G O T,E(B) D E F G O T,A B D E F G O T,A B D E F G O T
+tls_itype,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 
 multimedia_icl_capsadaptation,B D E F G O T,B D E F G O T,A B D E F G O T,A B D E F G O T
 
@@ -430,6 +431,7 @@
 lbs_admin,B D E F G O T,B D E F G O T,A B D E F G O T,A B D E F G O T
 lbs_agpslocationmanager,B D E F G O T,B D E F G O T,A B D E F G O T,A B D E F G O T
 lbs_agps_positioning_module,B D E F G O T,B D E F G O T,A B D E F G O T,A B D E F G O T
+lbs_ape_supl_positioning_module,B D E F G O T,B D E F G O T,A B D E F G O T,A B D E F G O T
 lbs_bt_positioning_module,B D E F G O T,B D E F G O T,A B D E F G O T,A B D E F G O T
 lbs_datasourceplugins,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 lbs_default_positioning_module,B D E F G O T,B D E F G O T,A B D E F G O T,A B D E F G O T
@@ -852,6 +854,10 @@
 testtools_ucc,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 testtools_utilities,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 testtools_wintunnel,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
+tls_jplangutil,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
+tls_inlinetext,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
+tls_numbergrouping,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
+tls_sortutil,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 tools_autotest,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 tools_bspbuilder,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 tools_build,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
@@ -937,6 +943,7 @@
 usb_metadata,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 usb_rndis,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 usb_test,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
+usb_autotest,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 wap-browser_wapbase,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 wap-browser_wappush,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 wap-browser_wappushsupport,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
diff -r cf2e20ee4073 -r 5ebc046f8778 symbianosbld/productionbldcbrconfig/tb101sf/AutoCBR_tb101sf_test_export.csv
--- a/symbianosbld/productionbldcbrconfig/tb101sf/AutoCBR_tb101sf_test_export.csv	Fri May 28 16:05:57 2010 +0100
+++ b/symbianosbld/productionbldcbrconfig/tb101sf/AutoCBR_tb101sf_test_export.csv	Wed Jun 02 13:07:07 2010 +0100
@@ -36,7 +36,8 @@
 networking_qoslib,B D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 
 # non-standard source code will not be delivered as beinG O Tagged as cat. B, but we need to deliver the cat B exports,,,
-graphics_itype,E(B) D E F G O T,E(B) D E F G O T,A B D E F G O T,A B D E F G O T
+#tls_itype,E(B) D E F G O T,E(B) D E F G O T,A B D E F G O T,A B D E F G O T
+tls_itype,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 
 multimedia_icl_capsadaptation,B D E F G O T,B D E F G O T,A B D E F G O T,A B D E F G O T
 
@@ -430,6 +431,7 @@
 lbs_admin,B D E F G O T,B D E F G O T,A B D E F G O T,A B D E F G O T
 lbs_agpslocationmanager,B D E F G O T,B D E F G O T,A B D E F G O T,A B D E F G O T
 lbs_agps_positioning_module,B D E F G O T,B D E F G O T,A B D E F G O T,A B D E F G O T
+lbs_ape_supl_positioning_module,B D E F G O T,B D E F G O T,A B D E F G O T,A B D E F G O T
 lbs_bt_positioning_module,B D E F G O T,B D E F G O T,A B D E F G O T,A B D E F G O T
 lbs_datasourceplugins,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 lbs_default_positioning_module,B D E F G O T,B D E F G O T,A B D E F G O T,A B D E F G O T
@@ -851,6 +853,10 @@
 testtools_ucc,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 testtools_utilities,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 testtools_wintunnel,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
+tls_jplangutil,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
+tls_inlinetext,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
+tls_numbergrouping,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
+tls_sortutil,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 tools_autotest,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 tools_bspbuilder,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 tools_build,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
@@ -935,6 +941,7 @@
 usb_metadata,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 usb_rndis,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 usb_test,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
+usb_autotest,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 wap-browser_wapbase,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 wap-browser_wappush,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 wap-browser_wappushsupport,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
diff -r cf2e20ee4073 -r 5ebc046f8778 symbianosbld/productionbldcbrconfig/tb101sf/GCCXMLcomponents.txt
--- a/symbianosbld/productionbldcbrconfig/tb101sf/GCCXMLcomponents.txt	Fri May 28 16:05:57 2010 +0100
+++ b/symbianosbld/productionbldcbrconfig/tb101sf/GCCXMLcomponents.txt	Wed Jun 02 13:07:07 2010 +0100
@@ -211,7 +211,6 @@
 graphics_graphicsresourceimplementation	\sf\os\graphics\graphicsresourceservices\graphicsresourceimplementation\group\graphics_graphicsresourceimplementation.mrp
 graphics_graphicsresourceinterface	\sf\os\graphics\graphicsresourceservices\graphicsresourceinterface\group\graphics_graphicsresourceinterface.mrp
 graphics_iculayoutengine	\sf\os\textandloc\fontservices\textshaperplugin\group\graphics_iculayoutengine.mrp
-graphics_itype	\sf\os\graphics\fbs\itypefontrasteriser\group\graphics_itype.mrp
 graphics_metadata	\sf\os\graphics\graphics_info\graphics_metadata\graphics_metadata.mrp
 graphics_opengles	\sf\os\graphics\opengles\openglesimplementation\group\graphics_opengles.mrp
 graphics_openglesdisplayproperty	\sf\os\graphics\opengles\openglesdisplayproperties\group\graphics_openglesdisplayproperty.mrp
@@ -247,6 +246,7 @@
 lbs_admin	\sf\os\lbs\locationmgmt\locationcore\group\lbs_admin.mrp
 lbs_agps_positioning_module	\sf\os\lbs\datasourcemodules\gpspositioningmodule\group\lbs_agps_positioning_module.mrp
 lbs_agpslocationmanager	\sf\os\lbs\locationmgmt\agpslocationmgr\group\lbs_agpslocationmanager.mrp
+lbs_ape_supl_positioning_module	\sf\os\lbs\datasourcemodules\locationapesuplpsy\group\lbs_ape_supl_positioning_module.mrp
 lbs_bt_positioning_module	\sf\os\lbs\datasourcemodules\bluetoothgpspositioningmodule\group\lbs_bt_positioning_module.mrp
 lbs_datasourceplugins	\sf\os\lbs\datasourcemodules\agpsintegrationmodule\group\lbs_datasourceplugins.mrp
 lbs_default_positioning_module	\sf\os\lbs\datasourcemodules\defaultpositioningmodule\group\lbs_default_positioning_module.mrp
@@ -568,6 +568,11 @@
 testtools_ucc	\sf\os\buildtools\toolsandutils\usecasecontroller\BuildScripts\group\testtools_ucc.mrp
 testtools_utilities	\sf\os\persistentdata\loggingservices\rfilelogger\group\testtools_utilities.mrp
 textandloc_metadata	\sf\os\textandloc\textandloc_info\textandloc_metadata\textandloc_metadata.mrp
+tls_inlinetext	\sf\os\textandloc\textandlocutils\inlinetext\group\tls_inlinetext.mrp
+tls_itype	\sf\os\textandloc\fontservices\ityperaster\group\tls_itype.mrp
+tls_jplangutil	\sf\os\textandloc\textandlocutils\jplangutil\group\tls_jplangutil.mrp
+tls_numbergrouping	\sf\os\textandloc\textandlocutils\numbergrouping\group\tls_numbergrouping.mrp
+tls_sortutil	\sf\os\textandloc\textandlocutils\sortutil\group\tls_sortutil.mrp
 tools_autotest	\sf\os\buildtools\toolsandutils\autotest\group\tools_autotest.mrp
 tools_build	\sf\os\buildtools\bldsystemtools\buildsystemtools\group\tools_build.mrp
 tools_cbr_tools	\sf\os\buildtools\toolsandutils\cbrtools\group\tools_cbr_tools.mrp
diff -r cf2e20ee4073 -r 5ebc046f8778 symbianosbld/productionbldcbrconfig/tb101sf/GTcomponents.txt
--- a/symbianosbld/productionbldcbrconfig/tb101sf/GTcomponents.txt	Fri May 28 16:05:57 2010 +0100
+++ b/symbianosbld/productionbldcbrconfig/tb101sf/GTcomponents.txt	Wed Jun 02 13:07:07 2010 +0100
@@ -226,7 +226,6 @@
 graphics_graphicsresourceimplementation	\sf\os\graphics\graphicsresourceservices\graphicsresourceimplementation\group\graphics_graphicsresourceimplementation.mrp
 graphics_graphicsresourceinterface	\sf\os\graphics\graphicsresourceservices\graphicsresourceinterface\group\graphics_graphicsresourceinterface.mrp
 graphics_iculayoutengine	\sf\os\textandloc\fontservices\textshaperplugin\group\graphics_iculayoutengine.mrp
-graphics_itype	\sf\os\graphics\fbs\itypefontrasteriser\group\graphics_itype.mrp
 graphics_metadata	\sf\os\graphics\graphics_info\graphics_metadata\graphics_metadata.mrp
 graphics_opengles	\sf\os\graphics\opengles\openglesimplementation\group\graphics_opengles.mrp
 graphics_openglesdisplayproperty	\sf\os\graphics\opengles\openglesdisplayproperties\group\graphics_openglesdisplayproperty.mrp
@@ -266,6 +265,7 @@
 lbs_admin	\sf\os\lbs\locationmgmt\locationcore\group\lbs_admin.mrp
 lbs_agps_positioning_module	\sf\os\lbs\datasourcemodules\gpspositioningmodule\group\lbs_agps_positioning_module.mrp
 lbs_agpslocationmanager	\sf\os\lbs\locationmgmt\agpslocationmgr\group\lbs_agpslocationmanager.mrp
+lbs_ape_supl_positioning_module	\sf\os\lbs\datasourcemodules\locationapesuplpsy\group\lbs_ape_supl_positioning_module.mrp
 lbs_bt_positioning_module	\sf\os\lbs\datasourcemodules\bluetoothgpspositioningmodule\group\lbs_bt_positioning_module.mrp
 lbs_datasourceplugins	\sf\os\lbs\datasourcemodules\agpsintegrationmodule\group\lbs_datasourceplugins.mrp
 lbs_default_positioning_module	\sf\os\lbs\datasourcemodules\defaultpositioningmodule\group\lbs_default_positioning_module.mrp
@@ -595,6 +595,11 @@
 testtools_utilities	\sf\os\persistentdata\loggingservices\rfilelogger\group\testtools_utilities.mrp
 testtools_wintunnel	\sf\os\buildtools\toolsandutils\wintunnel\group\testtools_WinTunnel_srconly.mrp
 textandloc_metadata	\sf\os\textandloc\textandloc_info\textandloc_metadata\textandloc_metadata.mrp
+tls_inlinetext	\sf\os\textandloc\textandlocutils\inlinetext\group\tls_inlinetext.mrp
+tls_itype	\sf\os\textandloc\fontservices\ityperaster\group\tls_itype.mrp
+tls_jplangutil	\sf\os\textandloc\textandlocutils\jplangutil\group\tls_jplangutil.mrp
+tls_numbergrouping	\sf\os\textandloc\textandlocutils\numbergrouping\group\tls_numbergrouping.mrp
+tls_sortutil	\sf\os\textandloc\textandlocutils\sortutil\group\tls_sortutil.mrp
 tools_autotest	\sf\os\buildtools\toolsandutils\autotest\group\tools_autotest.mrp
 tools_build	\sf\os\buildtools\bldsystemtools\buildsystemtools\group\tools_build.mrp
 tools_cbr_tools	\sf\os\buildtools\toolsandutils\cbrtools\group\tools_cbr_tools.mrp
@@ -615,6 +620,7 @@
 tools_testexecute	\sf\os\osrndtools\testexecfw1\testexecute\Group\tools_testexecute.mrp
 tools_utils_cedar	\sf\os\deviceplatformrelease\symbianosbld\cedarutils\tools_utils_cedar.mrp
 tools_utils_common	\sf\os\buildtools\bldsystemtools\commonbldutils\tools_utils_common.mrp
+usb_autotest	\sf\os\usb\usbmgmt\usbmgrautotest\group\usb_autotest.mrp
 usb_documentation	\sf\os\usb\usbmgmt\usbclassandmgrdocs\usb_documentation.mrp
 usb_manager	\sf\os\usb\usbmgmt\usbmgr\group\usb_manager.mrp
 usb_metadata	\sf\os\usb\usb_info\usb_metadata\usb_metadata.mrp