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>