# HG changeset patch
# User Pat Downey <patd@symbian.org>
# Date 1283340131 -3600
# Node ID 9376517ef47b419371bf8848ad187a2dc3c096e8
# Parent  dd7ad3d3dc46a32e6ae7e2bf806488a5d1f92c31
Revert incorrect RCL_3 drop:
Revision: 201033
Kit: 201035

diff -r dd7ad3d3dc46 -r 9376517ef47b group/bld.inf
--- a/group/bld.inf	Tue Aug 31 15:30:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
-* ==============================================================================
-*  Name        : bld.inf
-*  Part of     : 
-*  Description : 
-*  Version     : 
-*
-*  Copyright © 2006 Nokia. All rights reserved.
-*  This material, including documentation and any related
-*  computer programs, is protected by copyright controlled by
-*  Nokia Corporation. All rights are reserved. Copying,
-*  including reproducing, storing, adapting or translating, any
-*  or all of this material requires the prior written consent of
-*  Nokia. This material also contains confidential
-*  information which may not be disclosed to others without the
-*  prior written consent of Nokia.
-* ==============================================================================
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-
-PRJ_MMPFILES
-#include "../helix_ren/group/bld.inf"
-
-
-
-//  End of File  
-
diff -r dd7ad3d3dc46 -r 9376517ef47b helix_ren/group/bld.inf
--- a/helix_ren/group/bld.inf	Tue Aug 31 15:30:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*
-* ==============================================================================
-*  Name        : bld.inf
-*  Part of     : HELIXENGINE	
-*  Description : This main bld.inf file for HELIX_MDF 
-*  Version     : 
-*
-*  Copyright © 2006 Nokia Corporation.
-*  This material, including documentation and any related 
-*  computer programs, is protected by copyright controlled by 
-*  Nokia Corporation. All rights are reserved. Copying, 
-*  including reproducing, storing, adapting or translating, any 
-*  or all of this material requires the prior written consent of 
-*  Nokia Corporation. This material also contains confidential 
-*  information which may not be disclosed to others without the 
-*  prior written consent of Nokia Corporation.
-* ==============================================================================
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-../data/backup_registration.xml		        /epoc32/data/z/system/libs/plugins/backup_registration_ROP.xml
-
-PRJ_MMPFILES
-#include "../helixrfsplugin/group/bld.inf"
-    
-PRJ_TESTMMPFILES
diff -r dd7ad3d3dc46 -r 9376517ef47b helix_ren/helixrfsplugin/group/bld.inf
--- a/helix_ren/helixrfsplugin/group/bld.inf	Tue Aug 31 15:30:40 2010 +0300
+++ b/helix_ren/helixrfsplugin/group/bld.inf	Wed Sep 01 12:22:11 2010 +0100
@@ -1,29 +1,62 @@
 /*
+
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+
 * All rights reserved.
+
 * This component and the accompanying materials are made available
+
 * under the terms of "Eclipse Public License v1.0"
+
 * which accompanies this distribution, and is available
+
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+
 *
+
 * Initial Contributors:
+
 * Nokia Corporation - initial contribution.
+
 *
+
 * Contributors:
+
 *
+
 * Description: bld.inf for helix rfs plugin.
+
 *
+
 */
 
 
 
 PRJ_PLATFORMS
+
 DEFAULT
 
+
+
 PRJ_MMPFILES
-RfsHelixPlugin.mmp
+
+
+
+../group/RfsHelixPlugin.mmp
+
+
+
+
 
 PRJ_EXPORTS
 
+
+
+
+
 PRJ_TESTMMPFILES
 
+
+
+
+
diff -r dd7ad3d3dc46 -r 9376517ef47b layers.sysdef.xml
--- a/layers.sysdef.xml	Tue Aug 31 15:30:40 2010 +0300
+++ b/layers.sysdef.xml	Wed Sep 01 12:22:11 2010 +0100
@@ -3,19 +3,44 @@
   <!ENTITY layer_real_source_path "sf/mw/helix" >
 ]> 
 
-<SystemDefinition name="helix" schema="1.4.0">
+<SystemDefinition name="avdomain" schema="1.4.0">
 	<systemModel>
   <!-- Common file for prebuild layers-->
   	<layer name="mw_layer">
 			<module name="helix">
 				<unit unitID="helix" mrp="" bldFile="&layer_real_source_path;/group" filter="!sf_build" name="helix" />
+				<unit unitID="helix_src" mrp="" bldFile="&layer_real_source_path;/helix_ren/src/group" filter="!sf_build" name="helix_src" />
+				<unit unitID="ng_helix_src" mrp="" bldFile="&layer_real_source_path;/helix_ren/ng_helix/src/group" filter="!sf_build" name="ng_helix_src" />
 				<unit unitID="helix_stub" mrp="" bldFile="&layer_real_source_path;/helix_ren/helix_stub/group" filter="sf_build" name="helix_stub" />
 			</module>
     </layer>
 
+   	<layer name="api_test_layer">
+			<module name="helix_tsrc">
+				<unit unitID="helix_tsrc" name="helix_tsrc" bldFile="&layer_real_source_path;/tsrc/group" mrp="" />
+			</module>
+    </layer>
+
+   	<layer name="module_test_layer">
+			<module name="helix_ren_tsrc">
+				<unit unitID="helix_ren_tsrc" name="helix_ren_tsrc" bldFile="&layer_real_source_path;/helix_ren/tsrc/helixstiftest/group" mrp="" />
+			</module>
+    </layer>
+
+   	<layer name="pref_test_layer">
+			<module name="helix_tsrc_group">
+				<unit unitID="helix_tsrc_group" name="helix_tsrc_group" bldFile="&layer_real_source_path;/tsrc/group" mrp="" filter="TA_HELIX" />
+			</module>
+			<module name="helix_ren_tsrc_group">
+				<unit unitID="helix_ren_tsrc_group" name="helix_ren_tsrc_group" bldFile="&layer_real_source_path;/helix_ren/tsrc/helixstiftest/group" mrp="" filter="TA_HELIX_REN" />
+			</module>
+    </layer>
+
   	<layer name="mw_helix_layer">
 			<module name="helix_group">
 				<unit unitID="helix_group" mrp="" bldFile="&layer_real_source_path;/group" filter="!sf_build" name="helix_group" />
+				<unit unitID="helix_src_group" mrp="" bldFile="&layer_real_source_path;/helix_ren/src/group" filter="!sf_build" name="helix_src_group" />
+				<unit unitID="ng_helix_src_group" mrp="" bldFile="&layer_real_source_path;/helix_ren/ng_helix/src/group" filter="!sf_build" name="ng_helix_src_group" />
 				<unit unitID="helix_stub_group" mrp="" bldFile="&layer_real_source_path;/helix_ren/helix_stub/group" filter="sf_build" name="helix_stub_group" /> 
 			</module>
     </layer>
diff -r dd7ad3d3dc46 -r 9376517ef47b package_definition.xml
--- a/package_definition.xml	Tue Aug 31 15:30:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="sf:helix" name="Helix" levels="plugin framework server generic specific">
-    <collection id="sf:helix_ren" name="Helix Engine" level="framework">
-      <component id="sf:helix_ren_build" filter="s60" name="Helix Engine Build" introduced="^2">
-       <unit bldFile="helix_ren/group"/>
-      </component>
-      <component id="helix_stub" filter="sf_build" name="Helix Stub" class="api" introduced="^2">
-        <unit bldFile="helix_ren/helix_stub/group"/>
-      </component>
-      <component id="helixrfsplugin" filter="s60" name="Helix RFS Plugin" class="plugin" introduced="^2">
-        <unit bldFile="helix_ren/helixrfsplugin/group"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r dd7ad3d3dc46 -r 9376517ef47b package_map.xml
--- a/package_map.xml	Tue Aug 31 15:30:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<PackageMap root="sf" layer="mw"/>