# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1255355680 -3600
# Node ID 6d71f1d37a51e06f081f65e3e9edba94ad3c9cbd
# Parent  51f8cbfb54604a00a451349ee48801f59a27b6ef# Parent  152e5846f421530072a18ae345db8ea03bdfb1c7
catchup merge.

diff -r 152e5846f421 -r 6d71f1d37a51 symbian2/single/sources_fcl.csv
--- a/symbian2/single/sources_fcl.csv	Mon Oct 12 13:36:20 2009 +0100
+++ b/symbian2/single/sources_fcl.csv	Mon Oct 12 14:54:40 2009 +0100
@@ -13,6 +13,7 @@
 //v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/tools/makefile_templates/,/sf/tools/makefile_templates,branch,RCL_1,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/ostools/osrndtools/,/sf/ostools/osrndtools,branch,RCL_1,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,RCL_1,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/FCL/interim/QEMU/,/sf/adaptation/QEMU,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/boardsupport/,/sf/os/boardsupport,branch,RCL_1,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/ossrv/,/sf/os/ossrv,branch,RCL_1,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/security/,/sf/os/security,branch,RCL_1,layers.sysdef.xml
@@ -33,7 +34,6 @@
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/shortlinksrv/,/sf/os/shortlinksrv,branch,RCL_1,layers.sysdef.xml
 //v800008/Builds01/mercurial_development/sfl/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,RCL_1,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/unref/,/sf/os/unref,branch,RCL_1,
-//v800008/Builds01/mercurial_master_prod/oss/FCL/interim/QEMU/,/sf/os/QEMU,branch,default,
 //v800008/Builds01/mercurial_development/sfl/FCL/sf/mw/appsupport/,/sf/mw/appsupport,branch,RCL_1,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/securitysrv/,/sf/mw/securitysrv,branch,RCL_1,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/drm/,/sf/mw/drm,branch,RCL_1,layers.sysdef.xml
diff -r 152e5846f421 -r 6d71f1d37a51 symbian2/single/sysdefs/system_model.xml
--- a/symbian2/single/sysdefs/system_model.xml	Mon Oct 12 13:36:20 2009 +0100
+++ b/symbian2/single/sysdefs/system_model.xml	Mon Oct 12 14:54:40 2009 +0100
@@ -249,6 +249,13 @@
    </block>
   </layer>
   <layer name="adaptation" long-name="Adaptation">
+    <block name="syborg_adaptation" level="hw-if" long-name="Syborg Adaptation" levels="hw-if">
+      <collection id="baseport" name="Baseport" level="hw-if"> 
+        <component id="syborg" name="Syborg" introduced="symbian^2" purpose="optional">
+          <unit bldFile="adaptation\QEMU\baseport\syborg" mrp="baseport/syborg/syborg.mrp"/>
+        </component>
+      </collection>
+    </block>
    <block name="stubs" long-name="Stubs" tech_domain="hb" levels="adaptation plugin mid engine">
     <collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
      <component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs" origin-model="foundation">
diff -r 152e5846f421 -r 6d71f1d37a51 symbian2/split/sources_fcl.csv
--- a/symbian2/split/sources_fcl.csv	Mon Oct 12 13:36:20 2009 +0100
+++ b/symbian2/split/sources_fcl.csv	Mon Oct 12 14:54:40 2009 +0100
@@ -13,6 +13,7 @@
 //v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/tools/makefile_templates/,/sf/tools/makefile_templates,branch,RCL_1,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/ostools/osrndtools/,/sf/ostools/osrndtools,branch,RCL_1,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,RCL_1,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/FCL/interim/QEMU/,/sf/adaptation/QEMU,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/boardsupport/,/sf/os/boardsupport,branch,RCL_1,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/ossrv/,/sf/os/ossrv,branch,RCL_1,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/security/,/sf/os/security,branch,RCL_1,layers.sysdef.xml