--- a/installationservices/swi/test/tuiscriptadaptors/tswisasyncstep.cpp Thu May 27 12:58:35 2010 +0300
+++ b/installationservices/swi/test/tuiscriptadaptors/tswisasyncstep.cpp Fri Jun 11 13:45:18 2010 +0300
@@ -36,7 +36,9 @@
#include "dessisdataprovider.h"
#include "cafsisdataprovider.h"
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
#include <apsidchecker.h>
+#endif
#include <e32math.h>
using namespace Swi;
@@ -756,6 +758,7 @@
iAsyncLauncher=CAsyncLauncher::NewL();
User::LeaveIfError(RProperty::Get(KUidSystemCategory, KSystemStartupModeKey, iBootMode));
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
#ifndef SWI_TEXTSHELL_ROM
if (iBootMode != KTextShell)
{
@@ -771,6 +774,9 @@
// we always get the boot mode as 0 , reset the value to 1.
iBootMode = KTextShell;
#endif
+#else
+ iBootMode = KTextShell;
+#endif
iNotificationCount = 0;
}
@@ -784,6 +790,7 @@
delete iWatchdog;
iWatchdog=0;
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
#ifndef SWI_TEXTSHELL_ROM
if (iBootMode != KTextShell)
{
@@ -791,6 +798,7 @@
delete iSwiSidChecker;
}
#endif
+#endif
CActiveScheduler::Install(0);
delete iScheduler;
iScheduler=0;