# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1277910311 -3600
# Node ID 75ee3fb17193ccba43d4d42b71374006b82b743d
# Parent  dc8c3f5ca92a00c49cf57297db811e5db2977d50
Bring os layer pkgdefs up to date with latest code drop

diff -r dc8c3f5ca92a -r 75ee3fb17193 symbian4/os/cellularsrv/package_definition.xml
--- a/symbian4/os/cellularsrv/package_definition.xml	Wed Jun 30 15:58:34 2010 +0100
+++ b/symbian4/os/cellularsrv/package_definition.xml	Wed Jun 30 16:05:11 2010 +0100
@@ -120,5 +120,10 @@
 			  <unit mrp="cellularsrvapitest/telephonydevsoundhaitest/group/telephonydevsoundhaitest.mrp" bldFile="cellularsrvapitest/telephonydevsoundhaitest/group"/>
       </component>
     </collection>
+    <collection id="wapstack" name="WAP Stack" level="plugin">
+      <component id="wapmessageapi" name="WAP Message API" purpose="optional">
+        <unit bldFile="wapstack/wapmessageapi/group" mrp="wapstack/wapmessageapi/group/wap-stack_wapmessage.mrp" /> 
+      </component>
+    </collection>
   </package>
 </SystemDefinition>
diff -r dc8c3f5ca92a -r 75ee3fb17193 symbian4/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml
--- a/symbian4/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Wed Jun 30 15:58:34 2010 +0100
+++ b/symbian4/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Wed Jun 30 16:05:11 2010 +0100
@@ -154,7 +154,6 @@
       <package id="dlnasrv" level="specific" tech-domain="de" href="../../../../mw/dlnasrv/package_definition.xml"/>
       <package id="btservices" level="generic" tech-domain="de" href="../../../../mw/btservices/package_definition.xml"/>
       <package id="usbservices" level="generic" tech-domain="de" href="../../../../mw/usbservices/package_definition.xml"/>
-      <package id="shortlinkconn" level="generic" tech-domain="de" href="../../../../mw/shortlinkconn/package_definition.xml"/>
       <package id="imghandling" level="specific" tech-domain="mm" href="../../../../mw/imghandling/package_definition.xml"/>
       <package id="metadatasrv" level="specific" tech-domain="mm" href="../../../../mw/metadatasrv/package_definition.xml"/>
       <package id="mds" level="specific" tech-domain="mm" href="../../../../mw/mds/package_definition.xml"/>
diff -r dc8c3f5ca92a -r 75ee3fb17193 symbian4/os/deviceplatformrelease/package_definition.xml
--- a/symbian4/os/deviceplatformrelease/package_definition.xml	Wed Jun 30 15:58:34 2010 +0100
+++ b/symbian4/os/deviceplatformrelease/package_definition.xml	Wed Jun 30 16:05:11 2010 +0100
@@ -25,7 +25,7 @@
       <component id="system_model" name="System Model" class="config" introduced="^2" purpose="development" target="desktop">
         <unit mrp="foundation_system/system_model/system_model.mrp"/>
       </component>
-      <component id="sf_config" filter="s60" name="Foundation Config" introduced="^4">
+      <component id="sf_config" filter="s60,build_as_app" name="Foundation Config" introduced="^4">
         <unit bldFile="foundation_system/sf_config/CI_external/group"/>
       </component>
       <component id="config" filter="s60" name="Config" class="config" purpose="development">
diff -r dc8c3f5ca92a -r 75ee3fb17193 symbian4/os/devicesrv/package_definition.xml
--- a/symbian4/os/devicesrv/package_definition.xml	Wed Jun 30 15:58:34 2010 +0100
+++ b/symbian4/os/devicesrv/package_definition.xml	Wed Jun 30 16:05:11 2010 +0100
@@ -248,6 +248,12 @@
     <meta rel="Api" href="devicesrv_plat/tv_out_behaviour_api/tv_out_behaviour_api.metaxml"/>
     <unit bldFile="devicesrv_plat/tv_out_behaviour_api/group"/>
    </component>
+   <component id="autoaudio_plugin_api" name="Auto Audio Plugin API" class="api" filter="s60" introduced="^4">
+    <meta rel="config"> 
+      <defined condition="FF_AUTOMOTIVESTACK"/>
+    </meta>
+    <unit bldFile="devicesrv_plat/autoaudio_plugin_api/group"/>
+   </component>
   </collection>
   <collection id="accessoryservices" name="Accessory Services" level="framework">
    <component id="accessorymonitor" filter="s60" name="Accessory Monitor">
@@ -268,12 +274,18 @@
    <component id="tspclientmapper" filter="s60" name="TSP Client Mapper">
     <unit bldFile="accessoryservices/tspclientmapper/group"/>
    </component>
-   <component id="remotecontrolfw" name="Remote Control Framework" introduced="9.1" purpose="optional">
+   <component id="remotecontrolfw" name="Remote Control Framework" introduced="9.1" purpose="optional" filter="s60">
     <unit bldFile="accessoryservices/remotecontrolfw/group" mrp="accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
    </component>
    <component id="gid_pc_tool" filter="s60" name="Generic ID PC Tool" target="desktop" class="tool">
     <unit bldFile="accessoryservices/gid_pc_tool/group"/>
    </component>
+   <component id="autoaudioasy" filter="s60" name="Auto Audio Plugin" introduced="^4" class="plugin">
+    <meta rel="config"> 
+      <defined condition="FF_AUTOMOTIVESTACK"/>
+    </meta>
+    <unit bldFile="accessoryservices/autoaudioasy/group"/>
+   </component>
   </collection>
   <collection id="commonservices" name="Common Services" level="app-if">
    <component id="commonengine" filter="s60" name="Common Engine">
@@ -285,13 +297,13 @@
    <component id="platformenv" filter="s60" name="Platform Environment">
     <unit bldFile="commonservices/platformenv/group"/>
    </component>
-   <component id="sysutil" name="System Utilities" purpose="mandatory" introduced="ER5">
+   <component id="sysutil" name="System Utilities" purpose="mandatory" introduced="ER5" filter="s60">
     <meta rel="config"> 
       <defined condition="SYMBIAN_BAFL_SYSUTIL"/>
     </meta>
     <unit bldFile="commonservices/sysutil/group" mrp="commonservices/sysutil/group/sysutil.mrp"/>
    </component>
-   <component id="activitymanager" name="Activity Manager" purpose="mandatory" introduced="ER5">
+   <component id="activitymanager" name="Activity Manager" purpose="mandatory" introduced="ER5" filter="s60">
     <meta rel="config"> 
       <defined condition="SYMBIAN_BAFL_SYSUTIL"/>
     </meta>
@@ -368,10 +380,10 @@
    <component id="vibractrl" filter="s60" name="Vibra Control" deprecated="9.1">
     <unit bldFile="resourcemgmt/vibractrl/group"/>
    </component>
-   <component id="hwresourcesmgr" name="Hardware Resources Manager" introduced="^2" purpose="optional">
+   <component id="hwresourcesmgr" name="Hardware Resources Manager" introduced="^2" purpose="optional" filter="s60">
     <unit bldFile="resourcemgmt/hwresourcesmgr/group" mrp="resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
    </component>
-   <component id="hwresourcesmgrconfig" name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
+   <component id="hwresourcesmgrconfig" name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config" filter="s60">
     <unit bldFile="resourcemgmt/hwresourcesmgrconfig" mrp="resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
    </component>
    <component id="resourcemgmt_data" filter="s60" name="Resource Management Data" class="config">
@@ -407,16 +419,16 @@
    <component id="sysuiprovider" filter="s60" name="System UI Provider" introduced="^3">
     <unit bldFile="sysstatemgmt/sysuiprovider/group"/>
    </component>
-   <component id="systemstarter" name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
+   <component id="systemstarter" name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory" filter="s60">
     <unit bldFile="sysstatemgmt/systemstarter/group" mrp="sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
    </component>
-   <component id="systemstatemgr" name="System State Manager" introduced="^3" purpose="mandatory">
+   <component id="systemstatemgr" name="System State Manager" introduced="^3" purpose="mandatory" filter="s60">
     <meta rel="config"> 
       <defined condition="SYMBIAN_SYSTEM_STATE_MANAGEMENT"/>
     </meta>
     <unit bldFile="sysstatemgmt/systemstatemgr/group" mrp="sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
    </component>
-   <component id="systemstateplugins" name="System State Plugins" introduced="^3" purpose="optional" class="plugin">
+   <component id="systemstateplugins" name="System State Plugins" introduced="^3" purpose="optional" class="plugin" filter="s60">
     <meta rel="config">
       <defined condition="SYMBIAN_SYSTEM_STATE_MANAGEMENT"/>
     </meta>
@@ -425,7 +437,7 @@
     <meta rel="config">
       <defined condition="SYMBIAN_SYSTEM_STATE_MANAGEMENT"/>
     </meta>
-   <component id="systemstatereferenceplugins" name="System State Reference Plugins" introduced="^3" purpose="optional" class="plugin">
+   <component id="systemstatereferenceplugins" name="System State Reference Plugins" introduced="^3" purpose="optional" class="plugin"  filter="s60">
     <unit bldFile="sysstatemgmt/systemstatereferenceplugins/group" mrp="sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
    </component>
   </collection>
@@ -435,7 +447,7 @@
    </component>
   </collection>
   <collection id="systemhealthmanagement" name="System Health Management" level="server">
-   <component id="systemhealthmgr" name="System Health Manager" introduced="^3" purpose="optional">
+   <component id="systemhealthmgr" name="System Health Manager" introduced="^3" purpose="optional" filter="s60">
     <unit bldFile="systemhealthmanagement/systemhealthmgr/group" mrp="systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
    </component>
   </collection>
diff -r dc8c3f5ca92a -r 75ee3fb17193 symbian4/os/graphics/package_definition.xml
--- a/symbian4/os/graphics/package_definition.xml	Wed Jun 30 15:58:34 2010 +0100
+++ b/symbian4/os/graphics/package_definition.xml	Wed Jun 30 16:05:11 2010 +0100
@@ -114,7 +114,7 @@
       </component>
     </collection>
     <collection id="egl" name="EGL" level="internal-adaptations">
-      <component id="eglinterface" name="EGL Interface" introduced="^2" purpose="optional">
+      <component id="eglinterface" name="EGL Interface" introduced="^2" purpose="mandatory">
         <unit bldFile="egl/eglinterface/group" mrp="egl/eglinterface/group/graphics_eglheaders.mrp"/>
       </component>
       <component id="eglswitch" name="EGL Switch" introduced="^3" purpose="optional">
diff -r dc8c3f5ca92a -r 75ee3fb17193 symbian4/os/lbs/package_definition.xml
--- a/symbian4/os/lbs/package_definition.xml	Wed Jun 30 15:58:34 2010 +0100
+++ b/symbian4/os/lbs/package_definition.xml	Wed Jun 30 16:05:11 2010 +0100
@@ -63,21 +63,23 @@
       <component id="privacyprotocolmodule" name="Privacy Protocol Module" introduced="^2" purpose="optional" class="plugin">
         <unit bldFile="networkprotocolmodules/privacyprotocolmodule/group" mrp="networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
       </component>
+      <component id="networkpmutils" name="Network Protocol Module Utilities" introduced="^3" purpose="optional" class="plugin">
+        <unit bldFile="networkprotocolmodules/networkpmutils/group" mrp="networkprotocolmodules/networkpmutils/group/lbs_networkpmutils.mrp"/>
+      </component>
+      <component id="suplpmcore" name="SUPL Protocol Module Core" introduced="^3" purpose="optional" class="plugin">
+        <unit bldFile="networkprotocolmodules/suplpmcore/group" mrp="networkprotocolmodules/suplpmcore/group/lbs_suplpmcore.mrp"/>
+      </component>
+      <component id="networkpmasn1_pub" name="Network Protocol Module ASN1 Public Interfaces" introduced="^3" purpose="optional" class="api">
+        <unit bldFile="networkprotocolmodules/networkpmasn1_pub/group" mrp="networkprotocolmodules/networkpmasn1_pub/group/lbs_networkpmasn1_pub.mrp"/>
+      </component>
+      <component id="suplcontrolplaneprotocols" name="SUPL Control Plane Protocols" introduced="^3" purpose="optional" class="plugin">
+        <unit bldFile="networkprotocolmodules/suplcontrolplaneprotocols/group" mrp="networkprotocolmodules/suplcontrolplaneprotocols/group/lbs_suplcontrolplaneprotocols.mrp"/>
+      </component>
       <component id="suplproxyprotocolmodule" name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" class="plugin">
-        <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-        <unit bldFile="networkprotocolmodules/suplproxyprotocolmodule/sfgroup" mrp="networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
+        <unit bldFile="networkprotocolmodules/suplproxyprotocolmodule/group" mrp="networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
       </component>
       <component id="suplprotocolmodule" name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" class="plugin">
-        <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-        <unit bldFile="networkprotocolmodules/suplprotocolmodule/sfgroup" mrp="networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
-      </component>
-      <component id="suplrrlpasn1" filter="sf_build" name="SUPL RRLP ASN1 Parser">
-        <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-        <unit bldFile="networkprotocolmodules/common/suplrrlpasn1/group"/>
-      </component>
-      <component id="suplrrlpprotocol" name="SUPL RRLP Protocol Module">
-        <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-        <unit bldFile="networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup"/>
+       <unit bldFile="networkprotocolmodules/suplprotocolmodule/group" mrp="networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
       </component>
     </collection>
     <collection id="lbsapitest" name="Location API Tests" level="application-interface">
diff -r dc8c3f5ca92a -r 75ee3fb17193 symbian4/os/mm/package_definition.xml
--- a/symbian4/os/mm/package_definition.xml	Wed Jun 30 15:58:34 2010 +0100
+++ b/symbian4/os/mm/package_definition.xml	Wed Jun 30 16:05:11 2010 +0100
@@ -4,15 +4,18 @@
   <collection id="mm_pub" name="Multimedia Public Interfaces" level="app-if">
    <component id="audio_effects_api" name="Audio Effects API" class="api" filter="s60">
     <meta rel="Api" href="mm_pub/audio_effects_api/audio_effects_api.metaxml"/>
-    <unit bldFile="mm_pub/audio_effects_api/group"/>
+    <unit bldFile="mm_pub/audio_effects_api/group" filter="!test"/>
+    <unit bldFile="mm_pub/audio_effects_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="audio_effects_presets_api" name="Audio Effects Presets API" class="api" filter="s60">
     <meta rel="Api" href="mm_pub/audio_effects_presets_api/audio_effects_presets_api.metaxml"/>
-    <unit bldFile="mm_pub/audio_effects_presets_api/group"/>
+    <unit bldFile="mm_pub/audio_effects_presets_api/group" filter="!test"/>
+    <unit bldFile="mm_pub/audio_effects_presets_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="drm_audio_player_api" name="DRM Audio Player API" class="api" filter="s60">
     <meta rel="Api" href="mm_pub/drm_audio_player_api/drm_audio_player_api.metaxml"/>
-    <unit bldFile="mm_pub/drm_audio_player_api/group"/>
+    <unit bldFile="mm_pub/drm_audio_player_api/group" filter="!test"/>
+    <unit bldFile="mm_pub/drm_audio_player_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="multimedia_extension_interfaces_api" name="Multimedia Extension Interfaces API" class="api" filter="s60">
     <meta rel="Api" href="mm_pub/multimedia_extension_interfaces_api/multimedia_extension_interfaces_api.metaxml"/>
@@ -22,7 +25,8 @@
   <collection id="mm_plat" name="Multimedia Platform Interfaces" level="app-if">
    <component id="aac_decoder_config_api" name="AAC Decoder Config API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/aac_decoder_config_api/aac_decoder_config_api.metaxml"/>
-    <unit bldFile="mm_plat/aac_decoder_config_api/group"/>
+    <unit bldFile="mm_plat/aac_decoder_config_api/group" filter="!test"/>
+    <unit bldFile="mm_plat/aac_decoder_config_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="aac_decoder_config_msg_hdlr_api" name="AAC Decoder Config Msg Hdlr API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/aac_decoder_config_msg_hdlr_api/aac_decoder_config_msg_hdlr_api.metaxml"/>
@@ -58,7 +62,8 @@
    </component>
    <component id="audio_routing_api" name="Audio Routing API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/audio_routing_api/audio_routing_api.metaxml"/>
-    <unit bldFile="mm_plat/audio_routing_api/group"/>
+    <unit bldFile="mm_plat/audio_routing_api/group" filter="!test"/>
+    <unit bldFile="mm_plat/audio_routing_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="audio_routing_msg_hdlr_api" name="Audio Routing Msg Hdlr API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/audio_routing_msg_hdlr_api/audio_routing_msg_hdlr_api.metaxml"/>
@@ -94,7 +99,8 @@
    </component>
    <component id="eaac_plus_decoder_interface_api" name="eAAC Plus Decoder Interface API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/eaac_plus_decoder_interface_api/eaac_plus_decoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/eaac_plus_decoder_interface_api/group"/>
+    <unit bldFile="mm_plat/eaac_plus_decoder_interface_api/group" filter="!test"/>
+    <unit bldFile="mm_plat/eaac_plus_decoder_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="eaac_plus_decoder_interface_msg_hdlr_api" name="eAAC Plus Decoder Interface Message Handler API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/eaac_plus_decoder_interface_msg_hdlr_api/eaac_plus_decoder_interface_msg_hdlr_api.metaxml"/>
@@ -106,7 +112,8 @@
    </component>
    <component id="error_concealment_interface_api" name="Error Concealment Interface API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/error_concealment_interface_api/error_concealment_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/error_concealment_interface_api/group"/>
+    <unit bldFile="mm_plat/error_concealment_interface_api/group" filter="!test"/>
+    <unit bldFile="mm_plat/error_concealment_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="error_concealment_interface_msg_hdlr_api" name="Error Concealment Interface Message Handler API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/error_concealment_interface_msg_hdlr_api/error_concealment_interface_msg_hdlr_api.metaxml"/>
@@ -122,7 +129,8 @@
    </component>
    <component id="g711_decoder_interface_api" name="G711 Decoder Interface API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/g711_decoder_interface_api/g711_decoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/g711_decoder_interface_api/group"/>
+    <unit bldFile="mm_plat/g711_decoder_interface_api/group" filter="!test"/>
+    <unit bldFile="mm_plat/g711_decoder_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="g711_decoder_interface_msg_hdlr_api" name="G711 Decoder Interface Message Handler API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/g711_decoder_interface_msg_hdlr_api/g711_decoder_interface_msg_hdlr_api.metaxml"/>
@@ -134,7 +142,8 @@
    </component>
    <component id="g711_encoder_interface_api" name="G711 Encoder Interface API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/g711_encoder_interface_api/g711_encoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/g711_encoder_interface_api/group"/>
+    <unit bldFile="mm_plat/g711_encoder_interface_api/group" filter="!test"/>
+    <unit bldFile="mm_plat/g711_encoder_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="g711_encoder_interface_msg_hdlr_api" name="G711 Encoder Interface Message Handler API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/g711_encoder_interface_msg_hdlr_api/g711_encoder_interface_msg_hdlr_api.metaxml"/>
@@ -146,7 +155,8 @@
    </component>
    <component id="g729_decoder_interface_api" name="G729 Decoder Interface API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/g729_decoder_interface_api/g729_decoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/g729_decoder_interface_api/group"/>
+    <unit bldFile="mm_plat/g729_decoder_interface_api/group" filter="!test"/>
+    <unit bldFile="mm_plat/g729_decoder_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="g729_decoder_interface_msg_hdlr_api" name="G729 Decoder Interface Message Handler API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/g729_decoder_interface_msg_hdlr_api/g729_decoder_interface_msg_hdlr_api.metaxml"/>
@@ -158,7 +168,8 @@
    </component>
    <component id="g729_encoder_interface_api" name="G729 Encoder Interface API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/g729_encoder_interface_api/g729_encoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/g729_encoder_interface_api/group"/>
+    <unit bldFile="mm_plat/g729_encoder_interface_api/group" filter="!test"/>
+    <unit bldFile="mm_plat/g729_encoder_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="g729_encoder_interface_proxy_api" name="G729 Encoder Interface Proxy API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/g729_encoder_interface_proxy_api/g729_encoder_interface_proxy_api.metaxml"/>
@@ -170,7 +181,8 @@
    </component>
    <component id="global_audio_settings_api" name="Global Audio Settings API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/global_audio_settings_api/global_audio_settings_api.metaxml"/>
-    <unit bldFile="mm_plat/global_audio_settings_api/group"/>
+    <unit bldFile="mm_plat/global_audio_settings_api/group" filter="!test"/>
+    <unit bldFile="mm_plat/global_audio_settings_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="global_audio_settings_definition_api" name="Global Audio Settings Definition API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/global_audio_settings_definition_api/global_audio_settings_definition_api.metaxml"/>
@@ -178,7 +190,8 @@
    </component>
    <component id="ilbc_decoder_interface_api" name="Ilbc Decoder Interface API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/ilbc_decoder_interface_api/ilbc_decoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/ilbc_decoder_interface_api/group"/>
+    <unit bldFile="mm_plat/ilbc_decoder_interface_api/group" filter="!test"/>
+    <unit bldFile="mm_plat/ilbc_decoder_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="ilbc_decoder_interface_msg_hdlr_api" name="Ilbc Decoder Interface Message Handler API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/ilbc_decoder_interface_msg_hdlr_api/ilbc_decoder_interface_msg_hdlr_api.metaxml"/>
@@ -190,7 +203,8 @@
    </component>
    <component id="ilbc_encoder_interface_api" name="Ilbc Encoder Interface API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/ilbc_encoder_interface_api/ilbc_encoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/ilbc_encoder_interface_api/group"/>
+    <unit bldFile="mm_plat/ilbc_encoder_interface_api/group" filter="!test"/>
+    <unit bldFile="mm_plat/ilbc_encoder_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="ilbc_encoder_interface_msg_hdlr_api" name="Ilbc Encoder Interface Message Handler API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/ilbc_encoder_interface_msg_hdlr_api/ilbc_encoder_interface_msg_hdlr_api.metaxml"/>
@@ -218,7 +232,8 @@
    </component>
    <component id="ra8_decoder_interface_api" name="RA8 Decoder Interface API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/ra8_decoder_interface_api/ra8_decoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/ra8_decoder_interface_api/group"/>
+    <unit bldFile="mm_plat/ra8_decoder_interface_api/group" filter="!test"/>
+    <unit bldFile="mm_plat/ra8_decoder_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="ra8_decoder_interface_msg_hdlr_api" name="RA8 Decoder Interface Message Handler API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/ra8_decoder_interface_msg_hdlr_api/ra8_decoder_interface_msg_hdlr_api.metaxml"/>
@@ -234,7 +249,8 @@
    </component>
    <component id="restricted_audio_output_api" name="Restricted Audio Output API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/restricted_audio_output_api/restricted_audio_output_api.metaxml"/>
-    <unit bldFile="mm_plat/restricted_audio_output_api/group"/>
+    <unit bldFile="mm_plat/restricted_audio_output_api/group" filter="!test"/>
+    <unit bldFile="mm_plat/restricted_audio_output_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="restricted_audio_output_msg_hdlr_api" name="Restricted Audio Output Message Handler API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/restricted_audio_output_msg_hdlr_api/restricted_audio_output_msg_hdlr_api.metaxml"/>
@@ -246,7 +262,8 @@
    </component>
    <component id="sbc_encoder_interface_api" name="SBC Encoder Interface API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/sbc_encoder_interface_api/sbc_encoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/sbc_encoder_interface_api/group"/>
+    <unit bldFile="mm_plat/sbc_encoder_interface_api/group" filter="!test"/>
+    <unit bldFile="mm_plat/sbc_encoder_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="sbc_encoder_interface_msg_hdlr_api" name="SBC Encoder Interface Message Handler API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/sbc_encoder_interface_msg_hdlr_api/sbc_encoder_interface_msg_hdlr_api.metaxml"/>
@@ -262,7 +279,8 @@
    </component>
    <component id="speech_encoder_config_api" name="Speech Encoder Config API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/speech_encoder_config_api/speech_encoder_config_api.metaxml"/>
-    <unit bldFile="mm_plat/speech_encoder_config_api/group"/>
+    <unit bldFile="mm_plat/speech_encoder_config_api/group" filter="!test"/>
+    <unit bldFile="mm_plat/speech_encoder_config_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="speech_encoder_config_msg_hdlr_api" name="Speech Encoder Config Message Handler API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/speech_encoder_config_msg_hdlr_api/speech_encoder_config_msg_hdlr_api.metaxml"/>
@@ -302,7 +320,8 @@
    </component>
    <component id="wma_decoder_interface_api" name="WMA Decoder Interface API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/wma_decoder_interface_api/wma_decoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/wma_decoder_interface_api/group"/>
+    <unit bldFile="mm_plat/wma_decoder_interface_api/group" filter="!test"/>
+    <unit bldFile="mm_plat/wma_decoder_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="wma_decoder_interface_msg_hdlr_api" name="WMA Decoder Interface Message Handler API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/wma_decoder_interface_msg_hdlr_api/wma_decoder_interface_msg_hdlr_api.metaxml"/>
@@ -421,9 +440,6 @@
    <component id="mmdocs" name="Multimedia Documentation" purpose="development" class="doc">
     <unit mrp="mm_info/mmdocs/multimedia_documentation.mrp"/>
    </component>
-   <component id="mm_tsrc" name="Multimedia Tests" purpose="development" filter="s60,test,api_test,pref_test">
-    <unit bldFile="tsrc/group"/>
-   </component>
    <component id="mm_metadata" name="Multimedia Metadata" class="config" introduced="^2" purpose="development" target="desktop">
     <unit mrp="mm_info/mm_metadata/mm_metadata.mrp"/>
    </component>
diff -r dc8c3f5ca92a -r 75ee3fb17193 symbian4/os/textandloc/package_definition.xml
--- a/symbian4/os/textandloc/package_definition.xml	Wed Jun 30 15:58:34 2010 +0100
+++ b/symbian4/os/textandloc/package_definition.xml	Wed Jun 30 16:05:11 2010 +0100
@@ -1,24 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
   <package id="textandloc" name="Text and Localisation Services" levels="encoding util fonts tools text">
-    <collection id="textandloc_plat" name="Text and Localisation Platform Interfaces" level="text">
-     <component id="japanese_language_utilities_api" class="api" name="Japanese Language Utilities API" filter="s60">
-      <meta rel="Api" href="textandloc_plat/japanese_language_utilities_api/japanese_language_utilities_api.metaxml"/>
-      <unit bldFile="textandloc_plat/japanese_language_utilities_api/group"/>
-     </component>
-     <component id="sortutil_api" class="api" name="Sort Util API" filter="s60">
-      <meta rel="Api" href="textandloc_plat/sortutil_api/sortutil_api.metaxml"/>
-      <unit bldFile="textandloc_plat/sortutil_api/group"/>
-     </component>
-    </collection>
     <collection id="charconvfw" name="Character Conversion" level="encoding">
-      <component id="charconv_fw" name="Character Encoding and Conversion Framework" purpose="optional">
+      <component id="charconv_fw" name="Character Encoding and Conversion Framework" purpose="optional" filter="api_test"> <!-- both production and api_test-->
+    	<meta rel="testbuild">
+          <group name="test.syslibs_charconv"/>
+        </meta>
         <unit bldFile="charconvfw/charconv_fw/group" mrp="charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
       </component>
-      <component id="charconvplugins" name="Character Encoding and Conversion Plugins" purpose="optional" class="plugin">
+      <component id="charconvplugins" name="Character Encoding and Conversion Plugins" purpose="optional" class="plugin" filter="apit_test">  <!-- both production and api_test-->
+    	<meta rel="testbuild">
+          <group name="test.syslibs_charconv_plugins"/>
+        </meta>
         <unit bldFile="charconvfw/charconvplugins/group" mrp="charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
       </component>
-      <component id="fatfilenameconversionplugins" name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" class="plugin">
+      <component id="fatfilenameconversionplugins" name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" class="plugin" filter="api_test">   <!-- both production and api_test-->
+    	<meta rel="testbuild">
+          <group name="test.syslibs_fatcharsetconv"/>
+        </meta>
         <unit bldFile="charconvfw/fatfilenameconversionplugins/group" mrp="charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
       </component>      
     </collection>
@@ -26,7 +25,10 @@
       <component id="iculayoutengine" name="ICU Layout Engine" introduced="9.2" purpose="optional" class="plugin" deprecated="^4">
         <unit bldFile="fontservices/textshaperplugin/group" mrp="fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
       </component>
-      <component id="fontstore" name="Font Store" purpose="mandatory">
+      <component id="fontstore" name="Font Store" purpose="mandatory" filter="api_test"> <!-- both production and api_test-->
+    	<meta rel="testbuild">
+          <group name="test.graphics_fntstore"/>
+        </meta>
         <unit bldFile="fontservices/fontstore/group" mrp="fontservices/fontstore/group/graphics_fntstore.mrp"/>
       </component>
      <component id="textbase" name="Text Base" purpose="mandatory">
@@ -87,6 +89,13 @@
       <component id="textandloc_metadata" name="Text and Localisation Metadata" class="config" introduced="^2" purpose="development" target="desktop">
         <unit mrp="textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
       </component>
+      <component id="textandloc_graphicstestharness" name="Graphics Test Harness" introduced="8.1" purpose="development" filter="test,api_test">
+	  	<!-- this is not part of this package, it should not be refrerenced here -->
+    	<meta rel="testbuild">
+          <group name="test.graphics_testharness"/>
+        </meta>
+        <unit bldFile="../graphics/graphicstest/graphicstestharness/group"/>
+      </component>
     </collection>
   </package>
 </SystemDefinition>
diff -r dc8c3f5ca92a -r 75ee3fb17193 symbian4/os/usb/package_definition.xml
--- a/symbian4/os/usb/package_definition.xml	Wed Jun 30 15:58:34 2010 +0100
+++ b/symbian4/os/usb/package_definition.xml	Wed Jun 30 16:05:11 2010 +0100
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
  <package id="usb" name="USB" levels="adaptation hw-if plugin framework server app-if">
+  <collection id="usb_plat" name="USB Platform Interfaces" level="app-if">
+	<!-- placeholder for platform APIs -->
+  </collection>
   <collection id="usbldd" name="USB Logical Device Drivers" level="hw-if">
    <!-- usbclientdrivers  to be moved here from kernelhwsrv-->
   </collection>
diff -r dc8c3f5ca92a -r 75ee3fb17193 symbian4/os/wlan/package_definition.xml
--- a/symbian4/os/wlan/package_definition.xml	Wed Jun 30 15:58:34 2010 +0100
+++ b/symbian4/os/wlan/package_definition.xml	Wed Jun 30 16:05:11 2010 +0100
@@ -90,15 +90,5 @@
     <unit bldFile="wlan_bearer/wlannwif/group"/>
    </component>
   </collection>
-  <collection id="wlanapitest" name="WLAN API Tests" level="test">
-   <component id="wlanhaitest" name="WLAN HAI Tests" introduced="^2" purpose="development" filter="test">
-    <unit mrp="wlanapitest/wlanhaitest/group/wlanhaitest.mrp" bldFile="wlanapitest/wlanhaitest/group"/>
-   </component>
-  </collection>
-  <collection id="wlan_info" name="WLAN Info" level="test">
-   <component id="wlan_metadata" name="WLAN Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-    <unit mrp="wlan_info/wlan_metadata/wlan_metadata.mrp"/>
-   </component>
-  </collection>
  </package>
 </SystemDefinition>
diff -r dc8c3f5ca92a -r 75ee3fb17193 symbian4/os/xmlsrv/package_definition.xml
--- a/symbian4/os/xmlsrv/package_definition.xml	Wed Jun 30 15:58:34 2010 +0100
+++ b/symbian4/os/xmlsrv/package_definition.xml	Wed Jun 30 16:05:11 2010 +0100
@@ -2,23 +2,17 @@
 <SystemDefinition schema="3.0.0">
  <package id="xmlsrv" name="XML Services" levels="plugin server framework generic specific">
   <collection id="xmlsrv_plat" name="XML Services Platform Interfaces" level="specific">
-   <component id="xmlsrv_plat_build" name="XML Services Platform Interface Build" class="api" filter="s60">
-	<!-- need to fix the configuration used here. 
-	  Either destribute to other components or use the new feature flags confguration mechanisms.
-	  Remove this component and uncomment the other units when fixed-->
-    <unit bldFile="xmlsrv_plat/group"/>
-   </component>
    <component id="xml_encryption_api" name="XML Encryption API" class="api" filter="s60">
     <meta rel="Api" href="xmlsrv_plat/xml_encryption_api/xml_encryption_api.metaxml"/>
-    <!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
+    <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/>
    </component>
    <component id="xml_signature_api" name="XML Signature API" class="api" filter="s60">
     <meta rel="Api" href="xmlsrv_plat/xml_signature_api/xml_signature_api.metaxml"/>
-    <!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
+    <unit bldFile="xmlsrv_plat/xml_signature_api/group"/>
    </component>
    <component id="xml_security_engine_utils_api" name="XML Security Engine Utils API" class="api" filter="s60">
     <meta rel="Api" href="xmlsrv_plat/xml_security_engine_utils_api/xml_security_engine_utils_api.metaxml"/>
-    <!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
+    <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/>
    </component>
   </collection>
   <collection id="xmlsecurityengine" name="XML Security Engine" level="framework">