--- a/CompilerCompatibility/os/imagingext/package_definition.xml	Wed Apr 21 18:29:51 2010 +0100
+++ b/CompilerCompatibility/os/imagingext/package_definition.xml	Tue May 18 16:26:09 2010 +0100
@@ -54,32 +54,49 @@
 <systemModel>
 <layer name="os" long-name="OS" levels="hw services">
 <block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
-    <collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
-     <component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
-      <unit bldFile="/sf/os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-     </component>
-     <component name="imageadaptationextensions_build" filter="s60" long-name="Image Adaptation Extensions Build">
-      <!--  Move the export from this bld.inf into the above one and remove this component, or make this a ROM component -->
-      <unit bldFile="/sf/os/imagingext/imageadaptationextensions/group"/>
-     </component>
-    </collection>
-    <collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
-     <component name="exiflib" filter="s60" long-name="Exif Library">
-      <unit bldFile="/sf/os/imagingext/imagingmodules/exiflib/group"/>
-     </component>
-     <component name="jp2kcodec" filter="s60" long-name="JPEG2000 Decoder Plugin" plugin="Y">
-      <unit bldFile="/sf/os/imagingext/imagingmodules/jp2kcodec/group"/>
-     </component>
-    </collection>
-    <collection name="imagingext_info" long-name="Imaging Extensions Info" level="app-if">
-     <component name="imagingext_plat" filter="s60" long-name="Imaging Extensions Platform Interfaces" class="api">
-      <unit bldFile="/sf/os/imagingext/imagingext_plat/group"/>
-     </component>
-     <component name="imagingext_pub" filter="s60" long-name="Imaging Extensions Public Interfaces" class="api">
-      <unit bldFile="/sf/os/imagingext/imagingext_pub/group"/>
-     </component>
-    </collection>
-   </block>
+<collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
+<component name="exif_api" long-name="Exif API" filter="s60" class="api">
+<unit bldFile="/sf/os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
+</component>
+</collection>
+<collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
+<component name="jpeg2000_icl_plugin_api" long-name="JPEG2000 ICL plugin API" filter="s60" class="api">
+<unit bldFile="/sf/os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
+</component>
+<component name="extended_icl_jpeg_api" long-name="Extended ICL Jpeg API" filter="s60" class="api">
+<unit bldFile="/sf/os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
+</component>
+<component name="h324_annex_k_custom_api" long-name="H324 Annex K Custom API" filter="s60" class="api">
+<unit bldFile="/sf/os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
+</component>
+<component name="ecam_orientation_custom_api" long-name="ECam Orientation Custom API" filter="s60" class="api">
+<unit bldFile="/sf/os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
+</component>
+<component name="ecam_ui_orientation_override_custom_api" long-name="ECam UI Orientation Override Custom API" filter="s60" class="api">
+<unit bldFile="/sf/os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
+</component>
+<component name="ecam_face_tracking_custom_api" long-name="ECam Face Tracking Custom API" filter="s60" class="api">
+<unit bldFile="/sf/os/imagingext/imagingext_plat/ecam_face_tracking_custom_api/group"/>
+</component>
+</collection>
+<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
+<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
+<unit bldFile="/sf/os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
+</component>
+<component name="imageadaptationextensions_build" filter="s60" long-name="Image Adaptation Extensions Build">
+<!--  Move the export from this bld.inf into the above one and remove this component, or make this a ROM component -->
+<unit bldFile="/sf/os/imagingext/imageadaptationextensions/group"/>
+</component>
+</collection>
+<collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
+<component name="exiflib" filter="s60" long-name="Exif Library">
+<unit bldFile="/sf/os/imagingext/imagingmodules/exiflib/group"/>
+</component>
+<component name="jp2kcodec" filter="s60" long-name="JPEG2000 Decoder Plugin" plugin="Y">
+<unit bldFile="/sf/os/imagingext/imagingmodules/jp2kcodec/group"/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file