# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1275053175 -3600
# Node ID 7cd994b812ca26398c4e858717827c36e135d2b6
# Parent  3a7375419266ebdc3390b0e3f3a08005cfb83270# Parent  bc49e59e6c8b0d7e9ccb7acd8ee8bb9537fb3d53
Re-merge fix for bug 2109

diff -r 3a7375419266 -r 7cd994b812ca group/bld.inf
--- a/group/bld.inf	Tue May 25 14:32:39 2010 +0300
+++ b/group/bld.inf	Fri May 28 14:26:15 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 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"
@@ -16,6 +16,8 @@
 */
 
 
+#include "../rom/bld.inf"
+
 #include "../ossrv_pub/group/bld.inf"
 #include "../ossrv_plat/libutils/group/bld.inf"
 
@@ -28,45 +30,6 @@
 #include "../utilitylibraries/libutils/group/bld.inf"
 
 
-
-PRJ_EXPORTS
-//Exporting glib iby file 
-../rom/glib.iby  CORE_OS_LAYER_IBY_EXPORT_PATH(glib.iby)
-
-//Exporting ssl iby file
-../rom/ssl.iby  CORE_OS_LAYER_IBY_EXPORT_PATH(ssl.iby)
-
-//Exporting stdcpp iby file
-../rom/stdcpp4.iby  CORE_OS_LAYER_IBY_EXPORT_PATH(stdcpp4.iby)
-
-//Exporting stdlibs iby file
-../rom/stdlibs.iby  CORE_OS_LAYER_IBY_EXPORT_PATH(stdlibs.iby)
-
-
-
-
-
-//exporting openc_stdlibs stub sis
-../stdlibs/install/openc_stdlibs_stub.sis	/epoc32/data/z/system/install/openc_stdlibs_stub.sis
-//exporting openc_ssl stub sis
-../ssl/install/openc_ssl_stub.sis					/epoc32/data/z/system/install/openc_ssl_stub.sis
-//exporting openc_libzcore_stub.sis
-../ssl/install/openc_libzcore_stub.sis		/epoc32/data/z/system/install/openc_libzcore_stub.sis
-//exporting openc_glib stub sis 
-../glib/install/openc_glib_stub.sis				/epoc32/data/z/system/install/openc_glib_stub.sis
-//exporting stdcpp stub sis 
-../stdcpp/install/stdcpp_stub.SIS				/epoc32/data/z/system/install/stdcpp_stub.sis
-
-//exporting rpipe stub sis 
-../stdlibs/install/rpipe_stub.SIS	/epoc32/data/z/system/install/rpipe_stub.sis
-
-// exporting openc_liblogger stub sis
-../stdlibs/install/openc_liblogger_stub.sis	/epoc32/data/z/system/install/openc_liblogger_stub.sis
-
-// exporting openc_signalserver_stub sis
-../stdlibs/install/openc_signalserver_stub.sis	/epoc32/data/z/system/install/openc_signalserver_stub.sis
-
-
 //  End of File
 
 
diff -r 3a7375419266 -r 7cd994b812ca package_definition.xml
--- a/package_definition.xml	Tue May 25 14:32:39 2010 +0300
+++ b/package_definition.xml	Fri May 28 14:26:15 2010 +0100
@@ -158,7 +158,7 @@
       </component>
       <component id="ossrv_build" filter="s60" name="Generic OS Services Build">
       <!-- exports should be moved to individual components -->
-        <unit bldFile="group"/>
+        <unit bldFile="rom"/>
       </component>
       <component id="ossrv_plat" filter="s60" name="Generic OS Services Platform Interfaces" class="api">
         <unit bldFile="ossrv_plat/libutils/group"/>
diff -r 3a7375419266 -r 7cd994b812ca rom/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rom/bld.inf	Fri May 28 14:26:15 2010 +0100
@@ -0,0 +1,57 @@
+/*
+* Copyright (c) 2010 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: 
+*
+*/
+
+
+PRJ_EXPORTS
+//Exporting glib iby file 
+../rom/glib.iby  CORE_OS_LAYER_IBY_EXPORT_PATH(glib.iby)
+
+//Exporting ssl iby file
+../rom/ssl.iby  CORE_OS_LAYER_IBY_EXPORT_PATH(ssl.iby)
+
+//Exporting stdcpp iby file
+../rom/stdcpp4.iby  CORE_OS_LAYER_IBY_EXPORT_PATH(stdcpp4.iby)
+
+//Exporting stdlibs iby file
+../rom/stdlibs.iby  CORE_OS_LAYER_IBY_EXPORT_PATH(stdlibs.iby)
+
+
+
+
+
+//exporting openc_stdlibs stub sis
+../stdlibs/install/openc_stdlibs_stub.sis	/epoc32/data/z/system/install/openc_stdlibs_stub.sis
+//exporting openc_ssl stub sis
+../ssl/install/openc_ssl_stub.sis					/epoc32/data/z/system/install/openc_ssl_stub.sis
+//exporting openc_libzcore_stub.sis
+../ssl/install/openc_libzcore_stub.sis		/epoc32/data/z/system/install/openc_libzcore_stub.sis
+//exporting openc_glib stub sis 
+../glib/install/openc_glib_stub.sis				/epoc32/data/z/system/install/openc_glib_stub.sis
+//exporting stdcpp stub sis 
+../stdcpp/install/stdcpp_stub.SIS				/epoc32/data/z/system/install/stdcpp_stub.sis
+
+//exporting rpipe stub sis 
+../stdlibs/install/rpipe_stub.SIS	/epoc32/data/z/system/install/rpipe_stub.sis
+
+// exporting openc_liblogger stub sis
+../stdlibs/install/openc_liblogger_stub.sis	/epoc32/data/z/system/install/openc_liblogger_stub.sis
+
+// exporting openc_signalserver_stub sis
+../stdlibs/install/openc_signalserver_stub.sis	/epoc32/data/z/system/install/openc_signalserver_stub.sis
+
+//  End of File
+