# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1276259653 -10800
# Node ID d417d624aaf327a830e6c85cd83e0f77f4a240d0
# Parent  d67598c1c3be2edf4a1889b06740bac1d27e61b2
Revision: 201023
Kit: 2010123

diff -r d67598c1c3be -r d417d624aaf3 layers.sysdef.xml
--- a/layers.sysdef.xml	Thu May 27 14:33:06 2010 +0300
+++ b/layers.sysdef.xml	Fri Jun 11 15:34:13 2010 +0300
@@ -7,11 +7,11 @@
   <systemModel>
     <layer name="os_layer">
       <module name="usb">
-        <unit unitID="lcdo.usb" mrp="" bldFile="&layer_real_source_path;/group" name="usb" />
+        <unit unitID="usbdo.usb" mrp="" bldFile="&layer_real_source_path;/group" name="usb" />
       </module>
       <module name="">
-        <unit unitID="lcdo.usb.usbextension" mrp="" bldFile="&layer_real_source_path;/usbextension/group" filter="!sf_build" name="usb_usbextension" />
-        <unit unitID="lcdo.usb.usb_plat.usb_audio_stream_plugin_api" mrp="" bldFile="&layer_real_source_path;/usb_plat/usb_audio_stream_plugin_api/group" filter="!sf_build" name="usb_usb_plat_usb_audio_stream_plugin_api" />
+        <unit unitID="usbdo.usb.usbextension" mrp="" bldFile="&layer_real_source_path;/usbextension/group" filter="!sf_build" name="usb_usbextension" />
+        <unit unitID="usbdo.usb.usb_plat.usb_audio_stream_plugin_api" mrp="" bldFile="&layer_real_source_path;/usb_plat/usb_audio_stream_plugin_api/group" filter="!sf_build" name="usb_usb_plat_usb_audio_stream_plugin_api" />
       </module>    
     </layer>
   </systemModel>
diff -r d67598c1c3be -r d417d624aaf3 package_definition.xml
--- a/package_definition.xml	Thu May 27 14:33:06 2010 +0300
+++ b/package_definition.xml	Fri Jun 11 15:34:13 2010 +0300
@@ -20,7 +20,7 @@
         <unit mrp="usb_info/usb_metadata/usb_metadata.mrp"/>
       </component>
       <component id="usb_plat" name="USB Platform Interfaces" class="api" filter="s60">
-        <!--unit bldFile="usb_plat/group"/-->
+        <unit bldFile="usb_plat/group" mrp="usb_plat/group/usb_plat.mrp" />
       </component>
     </collection>
   </package>
diff -r d67598c1c3be -r d417d624aaf3 usb_info/usb_metadata/usb_metadata.mrp
--- a/usb_info/usb_metadata/usb_metadata.mrp	Thu May 27 14:33:06 2010 +0300
+++ b/usb_info/usb_metadata/usb_metadata.mrp	Fri Jun 11 15:34:13 2010 +0300
@@ -1,19 +1,3 @@
-#
-# 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: 
-#
-
 component           usb_metadata
 source   \sf\os\usb\usb_info\usb_metadata 
 source   \sf\os\usb\package_definition.xml
diff -r d67598c1c3be -r d417d624aaf3 usb_plat/group/usb_plat.mrp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usb_plat/group/usb_plat.mrp	Fri Jun 11 15:34:13 2010 +0300
@@ -0,0 +1,26 @@
+# 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:
+#
+#
+component	usb_plat
+
+source	\sf\os\usb\usb_plat\group
+
+binary	\sf\os\usb\usb_plat\group	all
+
+exports	\sf\os\usb\usb_plat\group
+
+notes_source	\component_defs\release.src
+
+ipr E