# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1266618015 -7200
# Node ID f7d9134af83e96f04f9e73e8e3b8755491fda69d
# Parent  40261b77571885fadf6d3531732c3af5d293de04
Revision: 201003
Kit: 201007

diff -r 40261b775718 -r f7d9134af83e layers.sysdef.xml
--- a/layers.sysdef.xml	Tue Feb 02 01:56:55 2010 +0200
+++ b/layers.sysdef.xml	Sat Feb 20 00:20:15 2010 +0200
@@ -39,6 +39,9 @@
 			<module name="">
 				<unit unitID="ARM_MDF_Decoders" mrp="" bldFile="&layer_real_source_path;/video/ARM_MDF_Decoders/group" filter="!sf_build" name="ARM_MDF_Decoders" />
 			</module>
+			<module name="">
+				<unit unitID="Utilities" mrp="" bldFile="&layer_real_source_path;/video/ARM_MDF_Decoders/Utilities/group" filter="sf_build" name="Utilities" />
+			</module>
     </layer>    
 
         <layer name="arm9e_layer"> 
@@ -111,6 +114,9 @@
 			<module name="">
 				<unit unitID="ARM_MDF_Decoders_group" mrp="" bldFile="&layer_real_source_path;/video/ARM_MDF_Decoders/group" filter="!sf_build" name="ARM_MDF_Decoders_group" />
 			</module>
+			<module name="">
+				<unit unitID="Utilities_group" mrp="" bldFile="&layer_real_source_path;/video/ARM_MDF_Decoders/Utilities/group" filter="sf_build" name="Utilities_group" />
+			</module>
     </layer>    
   </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r 40261b775718 -r f7d9134af83e mdfdevvideoextensions/nga_mdf_postprocessor/group/bld.inf
--- a/mdfdevvideoextensions/nga_mdf_postprocessor/group/bld.inf	Tue Feb 02 01:56:55 2010 +0200
+++ b/mdfdevvideoextensions/nga_mdf_postprocessor/group/bld.inf	Sat Feb 20 00:20:15 2010 +0200
@@ -26,6 +26,6 @@
 
 PRJ_EXPORTS
 
-../Rom/NGA_MDF_Postprocessor.iby     CORE_OS_LAYER_IBY_EXPORT_PATH(NGA_MDF_Postprocessor.iby)
+../rom/NGA_MDF_Postprocessor.iby     CORE_OS_LAYER_IBY_EXPORT_PATH(NGA_MDF_Postprocessor.iby)
 ../data/nga_mdf_postprocessor_stub.sis   /epoc32/data/z/system/install/nga_mdf_postprocessor_stub.sis
 
diff -r 40261b775718 -r f7d9134af83e mdfdevvideoextensions/nga_mdf_postprocessor/src/200195AF.rss
--- a/mdfdevvideoextensions/nga_mdf_postprocessor/src/200195AF.rss	Tue Feb 02 01:56:55 2010 +0200
+++ b/mdfdevvideoextensions/nga_mdf_postprocessor/src/200195AF.rss	Sat Feb 20 00:20:15 2010 +0200
@@ -21,7 +21,7 @@
 
 
 #include <ecom/registryinfo.rh>
-#include <mmf/devvideo/devvideopluginInterfaceuids.hrh>
+#include <mmf/devvideo/devvideoplugininterfaceuids.hrh>
 #include "NGAPostProcHwDevice_UID.hrh"
 
 RESOURCE REGISTRY_INFO theInfo
diff -r 40261b775718 -r f7d9134af83e mm_pub/drm_audio_player_api/tsrc/data/mmc/drm/test3gp.dcf
diff -r 40261b775718 -r f7d9134af83e mm_pub/drm_audio_player_api/tsrc/data/mmc/drm/testmp3.dcf
diff -r 40261b775718 -r f7d9134af83e mmtestenv/mmtesttools/Build/buildutils/mmbuild2.py
--- a/mmtestenv/mmtesttools/Build/buildutils/mmbuild2.py	Tue Feb 02 01:56:55 2010 +0200
+++ b/mmtestenv/mmtesttools/Build/buildutils/mmbuild2.py	Sat Feb 20 00:20:15 2010 +0200
@@ -151,14 +151,16 @@
         commands += ["--logfile=-"] # send output to stdout
         if self.iOptions.keepgoing:
             commands += ["--keepgoing"]
-        if len(remainingArgs)>0 and remainingArgs[0]=="winscw":
+        if testBuild:
+            commands += ["--config=winscw.test"]
+        else:
+            commands += ["--config=winscw"]
+        if not(len(remainingArgs)>0 and remainingArgs[0]=="winscw"):
+            # not the winscw scenario - we want both winscw and armv5
             if testBuild:
-                commands += ["--config=winscw.test"]
+                commands += ["--config=armv5.test"]
             else:
-                commands += ["--config=winscw"]
-        else:
-            if testBuild:
-               commands += ["--config=default.test"]
+                commands += ["--config=armv5"]
         commands += ["--filters=FilterSquashLog"] # reduce log size
         commands += ["--tries=2"] # retry on failure - e.g. for license fails
         commands += ["build"]
diff -r 40261b775718 -r f7d9134af83e video/ARM_MDF_Decoders/Utilities/group/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/video/ARM_MDF_Decoders/Utilities/group/bld.inf	Sat Feb 20 00:20:15 2010 +0200
@@ -0,0 +1,33 @@
+// BLD.INF
+/*
+* Copyright (c) 2007 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_PLATFORMS
+WINSCW ARMV5
+
+
+PRJ_MMPFILES
+
+// Buffer Processor related
+#include "../BufferProcessor/group/bld.inf"
+
+// State Machine related
+#include "../StateMachine/group/bld.inf"
+
+//-----------------------------------------------------------------------------
+//  End of BLD.INF
+//-----------------------------------------------------------------------------