--- a/cryptomgmtlibs/securitytestfw/test/autotesting/apr_bld.inf	Tue Jul 21 01:04:32 2009 +0100
+++ b/cryptomgmtlibs/securitytestfw/test/autotesting/apr_bld.inf	Thu Sep 10 14:01:51 2009 +0300
@@ -1,49 +1,53 @@
-/*
-* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "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
-* Builds the security subsystem 
-* This is the bld.inf file for building the secuirity subsystem.  It works for
-* both beech and cedar, using the appropriate macros (if defined) to determine
-* what gets built.
-*
-*/
-
-
-
-
-/**
- @file
-*/
-
-#ifndef TOOLS2
-// Disable everything except sistools and security_tools for TOOLS2 target
-
-#include "common/group/bld.inf"
-
-#include "testframework/group/bld.inf"
-
-#include "securityconfig/group/bld.inf"
-
-
-#include "swi/group/bld.inf"
-#include "swi/devicetools/group/bld.inf"
-#include "swi/pctools/group/bld.inf"
-
-#include "caf2/test/RefTestAgent/group/bld.inf"
-
-#endif
-
-// Only the SISTOOLS (makesis/signsis) and certapp build with TOOLS2
-#include "swi/sistools/group/bld.inf"
+/*
+* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "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
+* Builds for the apr subsystem 
+* This is the bld.inf file for building the secuirity subsystem.  It works for
+* both beech and cedar, using the appropriate macros (if defined) to determine
+* what gets built.
+*
+*/
+
+
+/**
+ @file
+*/
+
+#ifndef TOOLS2
+// Disable everything except sistools and security_tools for TOOLS2 target
+
+#include "installtestframework/group/bld.inf"
+
+#include "installconfig/group/bld.inf"
+
+#include "swi/group/bld.inf"
+#include "swi/devicetools/group/bld.inf"
+#include "swi/pctools/group/bld.inf"
+
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK 
+// SCR must be built before SIF, because SIF depends on the SCR
+#include "usif/scr/group/bld.inf"
+#include "usif/sif/group/bld.inf"
+#include "usif/sts/group/bld.inf"
+#include "usif/examples/installer/group/bld.inf"
+#include "usif/examples/appmanager/group/bld.inf"
+#endif
+
+#endif //TOOLS2
+
+// Only the SISTOOLS (makesis/signsis) and certapp build with TOOLS2
+#include "swi/sistools/group/bld.inf"
+