# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1277475201 -3600
# Node ID 198b9127f0f0e3675c71e04a32c6a0c108f30034
# Parent  85843213544904e6da664c02934cf72a76613dcd# Parent  650046e7baa84b487d91188c9645217113195228
Re-merge fixes for bug 476, bug 1895, bug 2049, bug 2149, bug 2509, bug 2539 and bug 2531.

diff -r 650046e7baa8 -r 198b9127f0f0 imgtools_os/romkiteka2/group/BLD.INF
--- a/imgtools_os/romkiteka2/group/BLD.INF	Wed Jun 09 18:43:19 2010 +0530
+++ b/imgtools_os/romkiteka2/group/BLD.INF	Fri Jun 25 15:13:21 2010 +0100
@@ -77,6 +77,7 @@
 
 // OBY file that builds a substantial Text Shell rom with no UI dependency and works with the Chassis build for BATS testing
 ../include/textshell_Chassis_BATS.oby	/epoc32/rom/include/textshell_Chassis_BATS.oby
+../include/textshell_naviengine_smp.oby	/epoc32/rom/include/textshell_naviengine_smp.oby
 
 #if defined(SYMBIAN_FEATURE_MANAGER)
 PRJ_PLATFORMS
diff -r 650046e7baa8 -r 198b9127f0f0 imgtools_os/romkiteka2/include/EPOCBASE.IBY
--- a/imgtools_os/romkiteka2/include/EPOCBASE.IBY	Wed Jun 09 18:43:19 2010 +0530
+++ b/imgtools_os/romkiteka2/include/EPOCBASE.IBY	Fri Jun 25 15:13:21 2010 +0100
@@ -54,8 +54,6 @@
 
 #include <network.iby>
 
-#include <rtp.iby>              /* Multimedia Protocols(RTP) component */
-
 #include <stdlib.iby>        /* Standard C Library */
 
 #include <securitycommonutils.iby>
@@ -81,27 +79,7 @@
 
 #endif // SYMBIAN_SYSTEM_STATE_MANAGEMENT
 
-#ifndef SYMBIAN_EXCLUDE_SIP  //sip components can be removed from build by defining this macro
-
-
-#include <sipsw.iby>		/* Multimedia Protocols(SIP) component */
-#include <siph2lanbearermonitor.iby>	/* Multimedia Protocols(SIP) component */
-#include <SipStateMachine.iby>	/* Multimedia Protocols(SIP) component */
-#include <SIPDummyPRT.iby>      /* Multimedia Protocols(SIP) component */
-
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-
-#include <SIPCPR.iby>           /* Multimedia Protocols(SIP) component */
-#include <SIPParams.iby>        /* Multimedia Protocols(SIP) component */
-#include <SIPSCPR.iby>          /* Multimedia Protocols(SIP) component */
-
-#else
-
-#include <sipproviders.iby>     /* Multimedia Protocols(SIP) component */
-
-#endif  // SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-
-#endif  // SYMBIAN_EXCLUDE_SIP   
+  
 
 #include <openenv.iby>
 #include <ezlib.iby>
diff -r 650046e7baa8 -r 198b9127f0f0 imgtools_os/romkiteka2/include/textshell_chassis_bats.oby
--- a/imgtools_os/romkiteka2/include/textshell_chassis_bats.oby	Wed Jun 09 18:43:19 2010 +0530
+++ b/imgtools_os/romkiteka2/include/textshell_chassis_bats.oby	Fri Jun 25 15:13:21 2010 +0100
@@ -29,7 +29,8 @@
 #undef SGA_SW_NO_GRAPHICSRESOURCE 
 #undef SYMBIAN_EXCLUDE_KEYMAP  
 
-
+// undef __BT to only get the client side dlls which should be present even if bluetooth hardware not present or not working.
+#undef __BT
 
 #define NO_METROTRK_APP // don't want metrotrk application
 #define HAS_ETHERNET	// include etherDrv, ether802, DHCP
@@ -103,7 +104,7 @@
 #include <c32.iby>
 #include <ecuart.iby>
 #include <irda.iby>
-// #include <bluetooth.iby>
+#include <bluetooth.iby>
 #include <stdlib.iby>
 #include <gdi.iby>
 #include <fntstore.iby>
diff -r 650046e7baa8 -r 198b9127f0f0 imgtools_os/romkiteka2/include/textshell_naviengine_smp.oby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/imgtools_os/romkiteka2/include/textshell_naviengine_smp.oby	Fri Jun 25 15:13:21 2010 +0100
@@ -0,0 +1,21 @@
+// Copyright (c) 2007-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:
+// This OBY File is used to build Text Shell NaviEngine SMP ROM Images.
+// 
+//
+
+#define SMP
+#include <naviengine.oby>
+#include <textshell_Chassis_bats.oby>
+#include <platsec.oby>
\ No newline at end of file