--- a/appfw/apparchitecture/group/APFILE.MMP	Mon May 03 12:40:23 2010 +0300
+++ b/appfw/apparchitecture/group/APFILE.MMP	Fri May 14 16:01:13 2010 +0300
@@ -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"
@@ -38,17 +38,17 @@
 
 macro UI_FRAMEWORKS_V1_REMNANT_FOR_JAVA_MIDLET_INSTALLER
 
-source			APFREC.CPP APFSTD.CPP APRuleBased.CPP ApLaunchChecker.cpp apinstallationmonitor.cpp
+source			APFREC.CPP APFSTD.CPP APRuleBased.CPP ApLaunchChecker.cpp
 source			apfmimecontentpolicy.cpp
 
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+source apinstallationmonitor.cpp
+#endif
+
 library         euser.lib efsrv.lib apparc.lib apgrfx.lib bafl.lib apserv.lib ecom.lib 
 library			apmime.lib caf.lib
-
+library			centralrepository.lib
 
-START RESOURCE ../apfile/apfmimecontentpolicy.rss
-HEADER  
-TARGETPATH   /resource/apps
-END
 
 START WINS
 	baseaddress	0x43000000
@@ -57,6 +57,12 @@
 START MARM
 END
 
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+	deffile APFILE.DEF
+#else
+	deffile apfile_legacy.def
+#endif
+
 // For the benefit of Eshell which cannot build a resource registration file
 START RESOURCE	eshell_reg.rss
 TARGETPATH	/private/10003a3f/apps