--- a/package_definition.xml	Thu Sep 02 17:00:51 2010 +0800
+++ b/package_definition.xml	Thu Sep 30 16:33:59 2010 +0800
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
  <package id="files" name="File Manager Apps" levels="support apps">
-  <collection id="filemanager" name="File Manager" level="apps">
-   <component id="filemanager_plat" name="File Manager Platform Interfaces" class="api" filter="s60" introduced="^4">
-    <unit base="filemanager/filemanager_plat"/>
+  <collection id="files_plat" name="File Manager" level="apps">
+   <component id="filemanager_api" name="File Manager Platform Interfaces" class="api" filter="bldfirst,s60" introduced="^4">
+       <unit bldFile="files_plat/filemanager_api" qt:qmakeArgs="-r -config rom" qt:proFile="filemanager_api.pro"/>
    </component>
    <component id="fmbkupengine" filter="s60,bldfirst" name="File Manager Backup Engine" introduced="^4">
        <unit bldFile="filemanager/src/fmbkupengine/group"/>
@@ -21,6 +21,9 @@
     <unit bldFile="filemanager/src/filemanager" qt:proFile="filemanager.pro"/>
    </component>
    <component id="filemanager_tests" name="File Manager Tests" filter="s60,test,qt_unit_test">
+     <meta rel="testbuild">
+     <group name="filemanager_tests_group"/>
+     </meta>
      <unit bldFile="filemanager/tsrc" qt:proFile="tsrc.pro"/>
    </component>
   </collection>