--- a/symbian3/split/sysdefs/system_model_os.xml	Tue Nov 17 11:36:24 2009 +0000
+++ b/symbian3/split/sysdefs/system_model_os.xml	Fri Nov 20 17:08:39 2009 +0000
@@ -1391,6 +1391,30 @@
 </collection>
 </block>
 <block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
+<collection name="graphicsaccelaration" long-name="Graphics Accelaration" level="adaptation">
+<component name="vgi" long-name="VGI" origin-model="foundation">
+  <unit bldFile="/sf/os/graphics/graphicsaccelaration/vgi/group"/>
+</component>
+</collection>
+<collection name="m3g" long-name="M3G" level="internal-adaptations">
+<component name="m3gcore11" long-name="M3G Core 11" origin-model="foundation">
+  <unit bldFile="/sf/os/graphics/m3g/m3gcore11/group"/>
+</component>
+</collection>
+<collection name="openWF" long-name="OpenWF" > <!-- for NGA graphics drop -->
+<component name="openwfcinterface" long-name="openwfcinterface">
+  <unit bldFile="/sf/os/graphics/graphicscomposition/openwfcinterface/group" /> <!-- OpenWF header files -->
+</component>
+<component name="openwfcompositionengine" long-name="openwfcompositionengine">
+  <unit bldFile="/sf/os/graphics/graphicscomposition/openwfcompositionengine/group" /> <!-- OpenWF composition engine implementation -->
+</component>
+<component name="openwfsupport" long-name="openwfsupport">
+  <unit bldFile="/sf/os/graphics/graphicscomposition/openwfsupport/group" /> <!-- OpenWF Adaptation features specific to the Symbian architecture -->
+</component>
+<component name="surfaceupdate" long-name="surfaceupdate">
+  <unit bldFile="/sf/os/graphics/graphicscomposition/surfaceupdate/group" /> <!-- Surface content changes server -->
+</component>
+</collection>
 <collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
 <component name="graphicsresource" long-name="Graphics Resource" introduced="tb92" purpose="optional">
 <unit bldFile="os\graphics\graphicsresourceservices\graphicsresource\group" mrp="os\graphics\graphicsresourceservices\graphicsresource\group\graphics_graphicsresource.mrp"/>
@@ -1433,6 +1457,9 @@
 <!-- intentionally not for the foundation despite being a mandatory component -->
 <unit bldFile="os\graphics\windowing\windowserver\group" mrp="os\graphics\windowing\windowserver\group\graphics_wserv.mrp"/>
 </component>
+     <component name="windowserverplugins" long-name="Window Server Plugins" purpose="mandatory" plugin="Y" origin-model="Symbian">
+      <unit bldFile="/sf/os/graphics/windowing/windowserverplugins/group" /> <!--Added for NGA - Plugins for the windowserver -->
+     </component>
 </collection>
 <collection name="printingservices" long-name="Printing Services" level="app-if">
 <component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
@@ -1456,11 +1483,20 @@
 <component name="openvginterface" long-name="OpenVG Interface" introduced="tb91" purpose="optional">
 <unit bldFile="os\graphics\openvg\openvginterface\group" mrp="os\graphics\openvg\openvginterface\group\graphics_openvgheaders.mrp"/>
 </component>
+<component name="openvg11" long-name="OpenVG11" level="internal-adaptations">
+ <unit bldFile="/sf/os/graphics/openvg/openvginterface/group/openvg11"/>  <! -- possibly should not be building this every time? ->
+</component>
 </collection>
 <collection name="egl" long-name="EGL" level="internal-adaptations">
 <component name="eglinterface" long-name="EGL Interface" introduced="tb91" purpose="optional">
 <unit bldFile="os\graphics\egl\eglinterface\group" mrp="os\graphics\egl\eglinterface\group\graphics_eglheaders.mrp"/>
 </component>
+<component name="n:eglimplementation" long-name="EGL Implementation" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
+ <unit bldFile="/sf/os/graphics/egl/eglrefimpl/group/" />  <!-- for NGA graphics drop -->
+</component>
+<component name="n:eglswitch" long-name="EGL Emulator Switch">
+ <unit bldFile="/sf/os/graphics/egl/eglswitch/group/" />  <!-- for NGA graphics drop -->
+</component>
 </collection>
 <collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
 <component name="gdi" long-name="GDI" purpose="mandatory">