--- a/symbian3/mw/mmappfw/package_definition.xml	Mon Nov 15 17:47:03 2010 +0000
+++ b/symbian3/mw/mmappfw/package_definition.xml	Thu Nov 18 13:28:32 2010 +0000
@@ -72,19 +72,11 @@
    </component>
    <component id="mpx_backstepping_utility_api" name="MPX Backstepping Utility API" introduced="^1" class="api" filter="s60">
     <meta rel="Api" href="mmappfw_plat/mpx_backstepping_utility_api/mpx_backstepping_utility_api.metaxml"/>
-    <meta rel="config">
-     <defined condition="IAD_INCLUDE_BACKSTEPPING"/>
-    </meta>
-    <!-- uncomment when configuration is put in place
-	 <unit bldFile="mmappfw_plat/mpx_backstepping_utility_api/group"/> -->
+     <unit bldFile="mmappfw_plat/mpx_backstepping_utility_api/group"/>
    </component>
    <component id="asx_parser_api" name="ASX Parser API" introduced="^1" class="api" filter="s60">
     <meta rel="Api" href="mmappfw_plat/asx_parser_api/asx_parser_api.metaxml"/>
-    <meta rel="config">
-     <defined condition="__WINDOWS_MEDIA"/>
-    </meta>
-	<!-- uncomment when configuration is put in place
-    <unit bldFile="mmappfw_plat/asx_parser_api/group"/> -->
+    <unit bldFile="mmappfw_plat/asx_parser_api/group"/>
    </component>
    <component id="playback_helper_api" name="Playback Helper API" introduced="^1" class="api" filter="s60">
     <unit bldFile="mmappfw_plat/playback_helper_api/group"/>
@@ -92,10 +84,6 @@
    <component id="videoplaylist_utility_api" name="Video Playlist Utility API" introduced="^1" class="api" filter="s60">
     <unit bldFile="mmappfw_plat/videoplaylist_utility_api/group"/>
    </component>
-   <component id="mmappfw_plat_build" name="Multimedia App Framework Platform Interface Build" introduced="^1" class="api" filter="s60">
-	<!-- needed only for #ifdefs. Remove anmd uncomment above units when configuration is in place -->
-    <unit bldFile="mmappfw_plat/group"/>
-   </component>
   </collection>
   <collection id="mpx" name="Multimedia Player" level="fw">
    <component id="commonframework" filter="s60" name="MPX Common Framework" introduced="^1">
@@ -110,17 +98,17 @@
    <component id="mpxviewfw" filter="s60" name="MPX View Framework" introduced="^1">
     <unit bldFile="mpx/viewframework/group"/>
    </component>
-   <component id="mpx_build" filter="s60" name="MPX Build" introduced="^1">
-    <!--  Move the export to another component or remove the #includes from this one -->
-    <unit bldFile="mpx/group"/>
+   <component id="mpx_conf" filter="s60" name="MPX Configuration" introduced="^1">
+    <unit bldFile="mpx/Conf"/>
+   </component>
+   <component id="mpx_rom" filter="s60" name="MPX ROM" introduced="^1">
+    <unit bldFile="mpx/rom"/>
+   </component>
+   <component id="mpx_sis" filter="s60" name="MPX SIS" introduced="^1">
+    <unit bldFile="mpx/sis"/>
    </component>
   </collection>
   <collection id="mmappcomponents" name="Multimedia App Components" level="utils">
-   <component id="mmappcomponents_build" filter="s60" name="Multimedia App Components Build" introduced="^1">
-    <!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
-      		Can remove this once configuration is in place-->
-    <unit bldFile="mmappcomponents/group"/>
-   </component>
    <component id="collectionhelper" filter="s60" name="Media Player Collection Helper" introduced="^1">
     <unit bldFile="mmappcomponents/collectionhelper/group"/>
    </component>
@@ -137,18 +125,10 @@
     <unit bldFile="mmappcomponents/mediaplayersettingsengine/group"/>
    </component>
    <component id="audiofetcher" filter="s60" name="Audio Fetcher" class="plugin" introduced="^1">
-    <meta rel="config">
-     <defined condition="IAD_INCLUDE_AUDIOFETCHER"/>
-    </meta>
-    <!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-    <!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
+    <unit bldFile="mmappcomponents/audiofetcher/group"/>
    </component>
    <component id="asxparser" filter="s60" name="ASX Parser" introduced="^1">
-    <meta rel="config">
-     <defined condition="__WINDOWS_MEDIA"/>
-    </meta>
-    <!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-    <!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
+    <unit bldFile="mmappcomponents/asxparser/group"/>
    </component>
    <component id="playbackhelper" filter="s60" name="Playback Helper" introduced="^3">
     <unit bldFile="mmappcomponents/playbackhelper/group"/>
@@ -161,10 +141,6 @@
    </component>
   </collection>
   <collection id="mmappfw_info" name="Multimedia App Framework Info" level="if">
-   <component id="mmappfw_build" filter="s60" name="Multimedia App Framework Build" introduced="^1">
-    <!--  Move the export to another component or remove the #includes from this one -->
-    <unit bldFile="group"/>
-   </component>
    <component id="mmappfw_test" filter="s60,test,api_test,pref_test" name="Multimedia App Framework Test" purpose="development" introduced="^1">
     <unit bldFile="tsrc/group" filter="TA_MMAPPFW"/>
    </component>