Merge in assorted configuration changes
authorWilliam Roberts <williamr@symbian.org>
Fri, 03 Sep 2010 14:30:00 +0100
changeset 117 2fe2ba109d6d
parent 116 c2b02bde6e2f (current diff)
parent 114 39a16c3a93fd (diff)
child 119 e35300c6541d
Merge in assorted configuration changes
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/foundation_system/sf_config/cenrep/group/bld.inf	Fri Sep 03 14:30:00 2010 +0100
@@ -0,0 +1,27 @@
+/*
+* Copyright (c) 2009 Symbian Foundation Ltd
+* 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:
+* Symbian Foundation Ltd - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* Exports ConE configuration files
+*/
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+../src/convert.confml                                     /epoc32/rom/config/
+../src/convertpluginlayer/root.confml                     /epoc32/rom/config/convertpluginlayer/
+../src/convertpluginlayer/implml/assets.convertprojectml  /epoc32/rom/config/convertpluginlayer/implml/
+
+PRJ_MMPFILES
+
+PRJ_TESTMMPFILES
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/foundation_system/sf_config/cenrep/src/convert.confml	Fri Sep 03 14:30:00 2010 +0100
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration xmlns="http://www.s60.com/xml/confml/2" xmlns:xi="http://www.w3.org/2001/XInclude">
+    <xi:include href="convertpluginlayer/root.confml"/>
+</configuration>
+ 
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/foundation_system/sf_config/cenrep/src/convertpluginlayer/implml/assets.convertprojectml	Fri Sep 03 14:30:00 2010 +0100
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<convertprojectml xmlns="http://www.s60.com/xml/convertprojectml/1">
+	<targetProject path=""/>
+	<!-- S60 Layer -->
+	<layer path="assets/s60">
+	    <!-- tempfix: copy possible implml files from incorrectly exported confml folder to implml folder -->
+        <folder path="implml">
+			<filter action="add" data="assets/s60/confml/*.crml"/>
+			<filter action="add" data="assets/s60/confml/*.gcfml"/>
+			<filter action="add" data="assets/s60/confml/*.ibyml"/>
+		</folder>
+      <!-- define layer root and configuration root -->
+		<file type="layer_root" path="root.confml">
+			<filter action="include_file" data="confml/*.confml"/>
+		</file>
+		<file type="configuration_root" path="s60_root.confml">
+			<filter action="include_layer" data="assets/s60/root.confml"/>
+		</file>	
+	</layer>
+ 
+	<!-- Symbian Layer -->		
+	<layer path="assets/symbianos">		
+	  <!-- copy possible files from "old" structure to new confproject structure -->
+	  <folder path="confml">
+		<filter action="add" data="confml_data/symbianos/*.confml"/>
+	  </folder>
+	  <folder path="implml">
+		<filter action="add" data="confml_data/symbianos/*.crml"/>
+		<filter action="add" data="confml_data/symbianos/*.gcfml"/>
+		<filter action="add" data="confml_data/symbianos/*.ibyml"/>
+	  </folder>
+      <!-- define layer root and configuration root -->
+      <file type="layer_root" path="root.confml">
+		<filter action="include_file" data="confml/*.confml"/>
+	  </file>
+	  <file type="configuration_root" path="symbianos_root.confml">
+		<filter action="include_layer" data="assets/symbianos/root.confml"/>
+	  </file>	
+	</layer>
+</convertprojectml>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/foundation_system/sf_config/cenrep/src/convertpluginlayer/root.confml	Fri Sep 03 14:30:00 2010 +0100
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration xmlns="http://www.s60.com/xml/confml/2" />
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/foundation_system/sf_config/config/engineering/group/bld.inf	Fri Sep 03 14:30:00 2010 +0100
@@ -0,0 +1,19 @@
+/*
+* Copyright (c) 2009 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_EXPORTS
+
+../inc/bldregional.hrh			/epoc32/include/ //
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/foundation_system/sf_config/config/engineering/inc/bldregional.hrh	Fri Sep 03 14:30:00 2010 +0100
@@ -0,0 +1,137 @@
+/*
+* Copyright (c) 2009 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: 
+*
+*/
+
+#ifndef __BLDREGIONAL_HRH 
+#define __BLDREGIONAL_HRH 
+
+//Defining only language 01 for SF build purposes
+#if defined LANGUAGE_IDS
+#undef LANGUAGE_IDS
+#endif
+#define LANGUAGE_IDS LANG sc 01  
+ 
+/** #FF_KOREAN  
+Runtime flag for Korean language 
+*/ 
+#undef FF_KOREAN                                           
+ 
+/** #__AVKON_APAC__  
+Device application UIs use Asia Pacific Look And Feel (LAF). 
+*/ 
+#undef __AVKON_APAC__                                      
+ 
+/** #__AVKON_ELAF__  
+Device application UIs use Europe Look And Feel (LAF). 
+*/ 
+#define __AVKON_ELAF__                                      
+ 
+/** #__BROWSER_IMEI_NOTIFICATION  
+"Purpose is to variate IMEI notification setting in Browser. In case when
+feature is on ,  user can see new setting item in Browser setting ""IMEI
+notification"" . If user enables the setting on browser,  UA prof filter will
+send phone's IMEI code within User-Agent field." 
+*/ 
+#undef __BROWSER_IMEI_NOTIFICATION                         
+ 
+/** #__CHINESE  
+Device uses Chinese language variant. 
+*/ 
+#undef __CHINESE                                           
+ 
+/** #__CHINESE_PRC_FONTS  
+Device has PRC China variant. This feature flag should be defined only if
+__CHINESE feature flag is defined. 
+*/ 
+#undef __CHINESE_PRC_FONTS                                 
+ 
+/** #__CHINESE_TAIWAN_HK_FONTS  
+Device has Taiwan and/or Hong Kong China variant. This feature flag should be
+defined only if __CHINESE feature flag is defined. 
+*/ 
+#undef __CHINESE_TAIWAN_HK_FONTS                           
+ 
+/** #__JAPANESE  
+Device uses Japanese language variant. 
+*/ 
+#undef __JAPANESE                                          
+ 
+/** #__JAPANESE_LARGER_DICTIONARY  
+Enlarged Japanese library for predictive text entry. This feature has no effect
+if the feature __JAPANESE is not defined. 
+*/ 
+#define __JAPANESE_LARGER_DICTIONARY                        
+ 
+/** #__JAPANESE_PICTOGRAPHS  
+Device supports Japanese pictograhps 
+*/ 
+#undef __JAPANESE_PICTOGRAPHS                              
+ 
+/** #__JAPAN_PREFIX_CHANGE  
+International call prefix feature for Japan to make it easier for end users to
+handle complicated Japanese international call prefixes. 
+*/ 
+#undef __JAPAN_PREFIX_CHANGE                               
+ 
+/** #__MMS_NONDESTRUCTIVE_FORWARD  
+"Controls the behaviour of the MMS application and message forwarding the
+message without retrieval. If the feature is on, the application allows the user
+to retrieve and re-forward it. If the feature is off, it is assumed that the
+message is not available any more in the MMSC after the forwarding." 
+*/ 
+#undef __MMS_NONDESTRUCTIVE_FORWARD                        
+ 
+/** #__MMS_NOTIFICATIONS_VIEW  
+MMBox (MMS Notifications) View can be opened from the message centre. It shows
+the multimedia messages stored in the MMS Center as a MMS notifications. 
+*/ 
+#undef __MMS_NOTIFICATIONS_VIEW                            
+ 
+/** #__OCR  
+Device supports Optical Character Recognizer feature (OCR). 
+*/ 
+#undef __OCR                                               
+ 
+/** #__OCR_HANWANG  
+Support for OCR engine from Hanwang Technology Co. Ltd. 
+*/ 
+#undef __OCR_HANWANG                                       
+ 
+/** #__OCR_ROMDB  
+"This flag controls OCR database storage location. If the flag is on, all OCR
+databases are put to ROM image." 
+*/ 
+#undef __OCR_ROMDB                                         
+ 
+/** #__SERIES60_LUNAR_CALENDAR  
+Calendar application uses Lunar calendar. Used in Asia Pacific (APAC) area. 
+*/ 
+#define __SERIES60_LUNAR_CALENDAR                           
+ 
+/** #__THAI  
+Device uses Thai language variant. 
+*/ 
+#undef __THAI                                              
+ 
+/** #__THAI_CALENDAR  
+"This flag controls if Thai Regional Calendar plugin is delivered to ROM Image. 
+Plugin enhances S60 Calendar application views with Thai specific information
+(e.g. Thai year).  " 
+*/ 
+#define __THAI_CALENDAR                                     
+ 
+
+#endif // __BLDREGIONAL_HRH 
--- a/foundation_system/sf_config/config/group/inc.inf	Thu Sep 02 21:44:50 2010 +0300
+++ b/foundation_system/sf_config/config/group/inc.inf	Fri Sep 03 14:30:00 2010 +0100
@@ -33,4 +33,5 @@
 ../inc/bldprivate.hrh                   /epoc32/include/bldprivate.hrh
 ../inc/bldcodeline.hrh                  /epoc32/include/bldcodeline.hrh
 ../inc/features.hrh                     /epoc32/include/features.hrh
-../../s60_features.csv                  /epoc32/include/s60_features.csv
\ No newline at end of file
+../../s60_features.csv                  /epoc32/include/s60_features.csv
+symbian_os_romdefs.hby                  /epoc32/rom/include/symbian_os_romdefs.hby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/foundation_system/sf_config/config/group/symbian_os_romdefs.hby	Fri Sep 03 14:30:00 2010 +0100
@@ -0,0 +1,18 @@
+// Copyright (c) 2007-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:
+// ROM-specific system-wide macros for Symbian OS vtb92
+// Not intended for customisation
+// 
+//
+
--- a/foundation_system/sf_config/config/inc/bldcodeline.hrh	Thu Sep 02 21:44:50 2010 +0300
+++ b/foundation_system/sf_config/config/inc/bldcodeline.hrh	Fri Sep 03 14:30:00 2010 +0100
@@ -58,6 +58,12 @@
 Flag enables ui accelerator toolkit development. 
 */ 
 #define RD_ALF_IN_PLATFORM                                  
+
+/** #ALF_USE_OPENWF_COMPOSITION
+Bug 1391 - UI Acceleration migration to OpenWF
+*/ 
+#define ALF_USE_OPENWF_COMPOSITION
+
  
 /** #RD_ALR_AND_NLR_ENABLERS  
 Enables Application and Network Level Roaming. 
@@ -395,7 +401,7 @@
 To provide timed synchronization feature to be included in the Data
 synchronization UI .  The flag will be used only in the OmaDsAppUi component. 
 */ 
-#define RD_DSUI_TIMEDSYNC                                   
+#undef RD_DSUI_TIMEDSYNC                                   
  
 /** #RD_DS_ICAL_SUPPORT  
 Support for iCalendar synchronization 
@@ -585,7 +591,7 @@
 /** #RD_IMAGEPREVIEW  
 ImageViewer's ImagePreview API and DLL are available in release. 
 */ 
-#define RD_IMAGEPREVIEW                                     
+#undef RD_IMAGEPREVIEW                                     
  
 /** #RD_IMAGINGCONFIGMANAGER  
 Flag to include/exclude Imaging Configuration Manager component. 
@@ -1239,25 +1245,25 @@
 done behind this flag to secure that existing functionality won't suffer
 regression during implementation. 
 */ 
-#undef RD_UI_TRANSITION_EFFECTS_LAYOUT_SWITCH              
+#define RD_UI_TRANSITION_EFFECTS_LAYOUT_SWITCH              
  
 /** #RD_UI_TRANSITION_EFFECTS_LIST  
 This flag will be used to secure that development of list transition effects
 won't break existing fullscreen and components transition effects. 
 */ 
-#undef RD_UI_TRANSITION_EFFECTS_LIST                       
+#define RD_UI_TRANSITION_EFFECTS_LIST                       
  
 /** #RD_UI_TRANSITION_EFFECTS_PHASE2  
 Feature enables early development of 2nd phase UI transition effects. 
 */ 
-#undef RD_UI_TRANSITION_EFFECTS_PHASE2                     
+#define RD_UI_TRANSITION_EFFECTS_PHASE2                     
  
 /** #RD_UI_TRANSITION_EFFECTS_POPUPS  
 "Development of transition effects in popups (notes, queries, etc) will be done
 behind this flag to secure that existing functionality won't suffer regression
 during implementation." 
 */ 
-#undef RD_UI_TRANSITION_EFFECTS_POPUPS                     
+#define RD_UI_TRANSITION_EFFECTS_POPUPS                     
  
 /** #RD_UI_ZOOM  
 This feature activates the zooming support in Series 60 UI. 
@@ -1414,4 +1420,12 @@
 #define RD_XML_ENGINE_API_CHANGE                            
  
 
-#endif // __BLDCODELINE_HRH 
\ No newline at end of file
+/**
+SYMBIAN_GRAPHICS_BUILD_OPENWF_WSERV
+
+If SYMBIAN_GRAPHICS_BUILD_OPENWF_WSERV, the windowserver component is built to use the OpenWF version of NGA.
+*/
+#define SYMBIAN_GRAPHICS_BUILD_OPENWF_WSERV
+
+
+#endif // __BLDCODELINE_HRH
--- a/foundation_system/sf_config/config/inc/bldprivate.hrh	Thu Sep 02 21:44:50 2010 +0300
+++ b/foundation_system/sf_config/config/inc/bldprivate.hrh	Fri Sep 03 14:30:00 2010 +0100
@@ -198,7 +198,7 @@
 @see SysUtil::DiskSpaceBelowCriticalLevelL
  
 */ 
-#undef SYMBIAN_BAFL_SYSUTIL                                
+#define SYMBIAN_BAFL_SYSUTIL                                
  
 /** #SYMBIAN_DOS_SERVER_SERVICES  
 Indicate that the DOS Server Services is present. This is needed to turn the RF
@@ -220,18 +220,18 @@
 This flag can be used to exclude Symbian's d_exc.exe from rom image when
 Symbian's base.iby is included 
 */ 
-#undef SYMBIAN_EXCLUDE_D_EXC                               
+#define SYMBIAN_EXCLUDE_D_EXC                               
  
 /** #SYMBIAN_EXCLUDE_ECAM_STUBPLUGIN  
 This flag is used to exclude Symbian Camera API stub 
 */ 
-#undef SYMBIAN_EXCLUDE_ECAM_STUBPLUGIN                     
+#define SYMBIAN_EXCLUDE_ECAM_STUBPLUGIN                     
  
 /** #SYMBIAN_EXCLUDE_KEYMAP  
 This flag can be used to include/exclude Symbian's KEYMAP_FILE (EKData.dll) from
 rom image if base.iby is included 
 */ 
-#undef SYMBIAN_EXCLUDE_KEYMAP                              
+#define SYMBIAN_EXCLUDE_KEYMAP                              
  
 /** #SYMBIAN_EXCLUDE_LOCATION_MANAGEMENT  
 The macro SYMBIAN_EXCLUDE_LOCATION_MANAGEMENT is used to exclude the location
@@ -250,13 +250,13 @@
 Related with PREQ1305
  
 */ 
-#undef SYMBIAN_EXCLUDE_MSMM_POLICY_PLUGIN                  
+#define SYMBIAN_EXCLUDE_MSMM_POLICY_PLUGIN                  
  
 /** #SYMBIAN_EXCLUDE_SCDV  
 This flag can be used to exclude Symbian ScDv.dll from rom image when Symbian's
 base.iby is included 
 */ 
-#undef SYMBIAN_EXCLUDE_SCDV                                
+#define SYMBIAN_EXCLUDE_SCDV                                
  
 /** #SYMBIAN_EXCLUDE_SIP  
 Excludes Symbian SIP components.  
@@ -266,7 +266,7 @@
 /** #SYMBIAN_GRAPHICS_ADAPTATION  
 This flag is used to take right graphics adaptation components to the ROM build 
 */ 
-#define SYMBIAN_GRAPHICS_ADAPTATION                        None 
+#define SYMBIAN_GRAPHICS_ADAPTATION                        SGA_SW 
  
 /** #SYMBIAN_GRAPHICS_USE_GCE  
 Includes the Symbian the Surface Manager and Graphics Composition Engine on ROM
@@ -413,14 +413,14 @@
 /** #SYMBIAN_INCLUDE_USB_OTG_HOST  
 Feature USB Host (and related OTG) binaries are included into romimage 
 */ 
-#undef SYMBIAN_INCLUDE_USB_OTG_HOST                        
+#define SYMBIAN_INCLUDE_USB_OTG_HOST                        
  
 /** #SYMBIAN_INCLUDE_USB_RNDIS  
  plugin, RNDIS agent and IP stack packet driver in the ROM. 
 Introduced by PREQ1872.
  
 */ 
-#undef SYMBIAN_INCLUDE_USB_RNDIS                           
+#define SYMBIAN_INCLUDE_USB_RNDIS                           
  
 /** #SYMBIAN_MULTIMEDIA_A3FDEVSOUND  
 This definition is used in symbian A3F build files.
@@ -442,7 +442,7 @@
 performance and memory consumption balance. Increasing the value increases the
 memory consumption. 
 */ 
-#define SYMBIAN_ODP_NUMBER_OF_MAX_LIVE_PAGES               4096 
+#define SYMBIAN_ODP_NUMBER_OF_MAX_LIVE_PAGES               65536 
  
 /** #SYMBIAN_ODP_NUMBER_OF_MIN_LIVE_PAGES  
 Defines the minimum number of 4k live pages available in the system for code
@@ -451,7 +451,7 @@
 performance and memory consumption balance. Increasing the value decreases the
 amount of free memory after start up. 
 */ 
-#define SYMBIAN_ODP_NUMBER_OF_MIN_LIVE_PAGES               0 
+#define SYMBIAN_ODP_NUMBER_OF_MIN_LIVE_PAGES               1024 
  
 /** #SYMBIAN_SYSTEM_STATE_MANAGEMENT  
 If SYMBIAN_SYSTEM_STATE_MANAGEMENT is defined, this will enable 
@@ -463,14 +463,14 @@
 
 This define supports PREQ1871. 
 */ 
-#undef SYMBIAN_SYSTEM_STATE_MANAGEMENT                     
+#define SYMBIAN_SYSTEM_STATE_MANAGEMENT                     
  
 /** #SYMBIAN_USE_DOS_SERVER_SERVICES  
 The DOS_SERVER_SERVICES should indicate that the DOS Server Services is present.
 This is needed to turn the RF on in an emergency call when the phone is in
 flight mode. 
 */ 
-#define SYMBIAN_USE_DOS_SERVER_SERVICES                     
+#undef SYMBIAN_USE_DOS_SERVER_SERVICES                     
  
 /** #SYMBIAN_USE_HCI_V2  
 Defines if HCIv2 (bluetooth v2.0) is used in image or not. 
@@ -482,7 +482,7 @@
 Feature Manager is present. The Feature Manager was part of the CoreOS, and
 there is a Symbian version of it in 9.5. 
 */ 
-#define SYMBIAN_USE_NOKIA_FEATURE_MANAGER                   
+#undef SYMBIAN_USE_NOKIA_FEATURE_MANAGER                   
  
 /** #USE_MSCDB  
 Enable usage of mass storage double buffering. 
@@ -1346,7 +1346,7 @@
 /** #__MP3  
 Device supports MP3 audio codec. 
 */ 
-#undef __MP3                                               
+#define __MP3                                               
  
 /** #__MROUTER  
 Device uses Symbian MRrouter technology for PC connectivity.  If this feature is
@@ -1681,9 +1681,9 @@
 #define __SAT_LANGUAGE_NOTIFICATION                         
  
 /** #__SAT_LAUNCH_BROWSER  
-"If this flag is enabled, upon receiving SAT Launch Browser command, the ME
+When this flag is enabled, upon receiving SAT Launch Browser command, the ME
 shall decide if it is able to execute the command. See details from 3GPP
-specifications." 
+specifications. 
 */ 
 #define __SAT_LAUNCH_BROWSER                                
  
@@ -2090,7 +2090,7 @@
 Defines whether transition effects are used in UI. Also controls whether the
 effect engine is included in ROM or not. 
 */ 
-#undef __UI_TRANSITION_EFFECTS                             
+#define __UI_TRANSITION_EFFECTS                             
  
 /** #__UI_ZOOM  
 This feature activates the zooming support in Series 60 UI. 
@@ -2130,7 +2130,7 @@
 /** #__USB_PTP  
 Includes and excludes PTP (Picture Transfer Protocol) components. 
 */ 
-#define __USB_PTP                                           
+#undef __USB_PTP                                           
  
 /** #__USB_REMOTE_PERSONALITY  
 Includes and excludes S60 USB Remote Personality component. 
@@ -2186,8 +2186,9 @@
 Device supports Windows Media. In other words it indicates whether WM-related
 components such as ASF-parser and codecs are in place. 
 */ 
-#undef __WINDOWS_MEDIA                                     
- 
+#define __WINDOWS_MEDIA
+
+
 /** #__WINDOWS_MEDIA_DRM  
 Device supports Windows Media DRM. In other words it indicates whether WMDRM
 related components such as WMDRM MTP plugin and WMDRM PK are in place. 
@@ -2206,6 +2207,18 @@
 showing it to user)." 
 */ 
 #define __XSP_EXTENSION_MANAGER                             
- 
 
-#endif // __BLDPRIVATE_HRH 
\ No newline at end of file
+/** 
+ * block of Feature flags believed to be required for wk12 tb10.1 baseline
+ */ 
+#define FF_CONTACTS_MYCARD  
+#define FF_CONTACTS_REMOTE_LOOKUP  
+#define FF_CONTACTS_SOCIAL  
+#define FF_DEVICE_ENCRYPTION_FEATURE  
+#define FF_DM_BROWSER_ADAPTER  
+#define FF_DM_STREAMING_ADAPTER
+#define FF_TMS  
+
+
+
+#endif // __BLDPRIVATE_HRH
--- a/foundation_system/sf_config/config/inc/bldpublic.hrh	Thu Sep 02 21:44:50 2010 +0300
+++ b/foundation_system/sf_config/config/inc/bldpublic.hrh	Fri Sep 03 14:30:00 2010 +0100
@@ -99,7 +99,7 @@
 Device uses capacitive touch technology in its display.
 
 */
-#undef FF_CAPACITIVE_DISPLAY                              
+#define FF_CAPACITIVE_DISPLAY                              
 
 /** #FF_CHINESE_FONTS_HIRES 
 This flag controls whether Chinese variants use TrueType fonts instead of the
@@ -168,7 +168,7 @@
 can remove the platform group plugin component. This allow the component to be
 removed from the ROM image, thus making the ROM size smaller.
 */
-#undef FF_CONTACTS_GROUP_FUNCTIONALITY                    
+#define FF_CONTACTS_GROUP_FUNCTIONALITY                    
 
 /** #FF_CONTACTS_NICKNAME 
 The nickname functionality needs a feature flag for the following reasons:
@@ -209,7 +209,7 @@
 offers self-test service on the Mobile Applications and hardware for the phone
 users.
 */
-#define FF_DEVICE_DIAGNOSTICS_APP                          
+#undef FF_DEVICE_DIAGNOSTICS_APP                          
 
 /** #FF_DM_INSTALL_SECURITY 
 OMA DM SW installer implementation included in build.
@@ -309,13 +309,13 @@
 /** #FF_FMTX 
 FMTX application and Nseries Music Player support for FMTX
 */
-#define FF_FMTX                                            
+#undef FF_FMTX                                            
 
 /** #FF_FULLSCR_HWR_INPUT 
 Indicates whether a device needs fullscreen HWR (HandWritingRecognition) input
 or not.
 */
-#define FF_FULLSCR_HWR_INPUT                               
+#undef FF_FULLSCR_HWR_INPUT                               
 
 /** #FF_GENERIC_FONTS_ASSETS 
 This flag is used to check if generic font assets are to be used, this is used
@@ -553,7 +553,7 @@
 
 If the flag is not defined, MR UI related components are not in ROM.
 */
-#define FF_MEETING_REQUEST_UI                              
+#undef FF_MEETING_REQUEST_UI                              
 
 /** #FF_MENU_TEXTURE_PRELOADING 
 In Menu (AppShell) application the performance of changing the folder has been
@@ -631,7 +631,7 @@
 This feature enables OMA SCOMO feature in "application management component".
 
 */
-#undef FF_OMA_SCOMO_ADAPTER                               
+#define FF_OMA_SCOMO_ADAPTER                               
 
 /** #FF_OOM_MONITOR2_COMPONENT 
 Feature flag for controlling the inclusion of Out-of-Memory2 component into the
@@ -683,7 +683,7 @@
 flag is used to enable PNPProvisioning HTTP filter which by passes the download
 manager launching PNPMS provisioning engine.
 */
-#define FF_PNPMS_PROV_FILTER                               
+#undef FF_PNPMS_PROV_FILTER                               
 
 /** #FF_PNPMS_SERVICE_HELP_PLUGIN 
 This feature flag is required for launching PNPMS application from general
@@ -693,7 +693,7 @@
 and direct the browser with predefined PnPMS server URL where user can download
 provisioning settings over HTTP from web server.
 */
-#define FF_PNPMS_SERVICE_HELP_PLUGIN                       
+#undef FF_PNPMS_SERVICE_HELP_PLUGIN                       
 
 /** #FF_POWER_SAVE 
 "Power save mode is a collection of features which are put in a power saving
@@ -753,7 +753,7 @@
 The device has multidirectional "rocker" key.
 
 */
-#undef FF_ROCKER_KEY                                      
+#define FF_ROCKER_KEY                                      
 
 /** #FF_ROM_INCLUDE_ALF 
 This flags controls whether the UI Accelerator toolkit (ALF) is included in the
@@ -764,12 +764,12 @@
 /** #FF_RUNTIME_DEVICE_CAPABILITY_CONFIGURATION 
 To enable the feature to variate the device capability on runtime
 */
-#undef FF_RUNTIME_DEVICE_CAPABILITY_CONFIGURATION         
+#define FF_RUNTIME_DEVICE_CAPABILITY_CONFIGURATION         
 
 /** #FF_S60_HELPS_IN_USE 
 Platform helps are included into image based on this flag.
 */
-#define FF_S60_HELPS_IN_USE                                
+#undef FF_S60_HELPS_IN_USE                                
 
 /** #FF_S60_POSTING_IMPLEMENTATION_IN_USE 
 Flag to enable/disable usage of S60 implementation of posting surface api.
@@ -814,7 +814,7 @@
 together with some Sound IDs.
 
 */
-#undef FF_TACTICONS                                       
+#define FF_TACTICONS                                       
 
 /** #FF_TACTILE_FEEDBACK 
 Device supports Tactile Feedback. Tactile feedback is produced by UI components
@@ -827,7 +827,7 @@
 This is the feature flag to allow branching of the code flow based on the
 capability check or SID check for the third party applications.
 */
-#undef FF_TARM_CAPABILITY_BASED_ACCESS                    
+#define FF_TARM_CAPABILITY_BASED_ACCESS                    
 
 /** #FF_TCP_MYFAVES_FEATURE 
 The feature flag is to turn ON/OFF MyFaves feature in a S60 3.2 complementary
@@ -883,7 +883,7 @@
 /** #FF_USB_HOST 
 The flag excludes all S60 USB host and OTG related components. 
 */
-#undef FF_USB_HOST                                        
+#define FF_USB_HOST                                        
 
 /** #FF_USE_EGPRS_ICON 
 The flag is used to enable EGPRS icon in the status pane. If the flag is
@@ -900,7 +900,7 @@
 The flag affects how S60 components see the drives setup from estart
 txt-file(s).
 */
-#undef FF_USE_MASS_STORAGE_CONFIG                         
+#define FF_USE_MASS_STORAGE_CONFIG                         
 
 /** #FF_USE_ZI_ENGINE 
 On enabling this feature flag eZitext engine will be part of the Image and
@@ -990,6 +990,7 @@
 /** #FF_WLAN_EXTENSIONS 
 Device supports extended WLAN functionalities e.g. for association and
 authentication.
+NB. The code associated with this Feature flag as not been contributed to Symbian.
 */
 #undef FF_WLAN_EXTENSIONS                                 
 
@@ -1012,7 +1013,7 @@
 This feature flag is used only for including WAPI binaries to ROM. WAPI
 functionality can be (run-time) enabled with FF_WLAN_WAPI.
 */
-#undef FF_WLAN_WAPI_INCLUDE_IN_ROM                        
+#define FF_WLAN_WAPI_INCLUDE_IN_ROM                        
 
 /** #FF_XML_IDLE_THEME_BASIC_IDLE 
 Controls if Basic idle theme is going to image or not.
@@ -1647,12 +1648,12 @@
 /** #__LAYOUT_240_320 
 Device supports 240x320 resolution (QVGA)
 */
-#define __LAYOUT_240_320                                   
+#undef __LAYOUT_240_320                                   
 
 /** #__LAYOUT_240_320_LARGE_SCREEN 
 "Device supports 240x320 resolution (QVGA2 for larger screens, portrait)"
 */
-#define __LAYOUT_240_320_LARGE_SCREEN                      
+#undef __LAYOUT_240_320_LARGE_SCREEN                      
 
 /** #__LAYOUT_240_320_QVGA3 
 Device supports 240x320 resolution (QVGA3)
@@ -1662,12 +1663,12 @@
 /** #__LAYOUT_320_240 
 Device supports 320x240 resolution (QVGA landscape)
 */
-#define __LAYOUT_320_240                                   
+#undef __LAYOUT_320_240                                   
 
 /** #__LAYOUT_320_240_LARGE_SCREEN 
 "Device supports 320x240 resolution (QVGA2 for larger screens, landscape)"
 */
-#define __LAYOUT_320_240_LARGE_SCREEN                      
+#undef __LAYOUT_320_240_LARGE_SCREEN                      
 
 /** #__LAYOUT_320_240_QVGA3 
 Device supports 320x240 resolution (QVGA3)
@@ -1703,7 +1704,7 @@
 /** #__MEDIA_TRANSFER_PROTOCOL 
 Device supports MTP application.
 */
-#undef __MEDIA_TRANSFER_PROTOCOL                          
+#define __MEDIA_TRANSFER_PROTOCOL                          
 
 /** #__MMS_POSTCARD 
 Flag is used ro incorporate Postcard application into the release.
@@ -1747,7 +1748,7 @@
 /** #__OMA_POC 
 OMA Push-to-talk over Cellular.
 */
-#define __OMA_POC                                          
+#undef __OMA_POC                                          
 
 /** #__ON_SCREEN_DIALER 
 This flag indicates that the dialer.dll is included to the rom image and
@@ -1957,7 +1958,7 @@
 /** #__SYNCML_DM_OBEX 
 Device supports device management over OBEX.
 */
-#undef __SYNCML_DM_OBEX                                   
+#define __SYNCML_DM_OBEX                                   
 
 /** #__SYNCML_DM_OTA 
 SyncML DM OMA provisioning adapter.
--- a/foundation_system/sf_config/config/inc/bldvariant.hrh	Thu Sep 02 21:44:50 2010 +0300
+++ b/foundation_system/sf_config/config/inc/bldvariant.hrh	Fri Sep 03 14:30:00 2010 +0100
@@ -29,6 +29,6 @@
 #include <bldpublic.hrh>
 #include <bldregional.hrh> 
 
-#include "productvariant.hrh" 
+#include "ProductVariant.hrh" 
 
 #endif
--- a/foundation_system/sf_config/config/inc/privateruntimeids.hrh	Thu Sep 02 21:44:50 2010 +0300
+++ b/foundation_system/sf_config/config/inc/privateruntimeids.hrh	Fri Sep 03 14:30:00 2010 +0100
@@ -646,4 +646,254 @@
 
 #define KFeatureIdXspExtensionManager                       1692
 
+#define KFeatureIdCoverToDeskSetting                        5061
+
+#define KFeatureIdDmCameraDisable                           5064
+
+#define KFeatureIdEmailIpsServices                          5089
+
+#define KFeatureIdEsCalendar                                5078 
+
+#define KFeatureIdEsEmail                                   5082 
+
+#define KFeatureIdEsEmailFramework                          5083 
+
+#define KFeatureIdFfAiEmailWidget                           5138
+
+#define KFeatureIdFfAnykeyAlphabeticalList                  5158 
+
+#define KFeatureIdFfAnykeyDisablekeytones                   5156 
+
+#define KFeatureIdFfAnykeyKickstandEnabled                  5166 
+
+#define KFeatureIdFfAnykeyOnetouchui                        5165 
+
+#define KFeatureIdFfAnykeyOwnkeyEnabled                     5167 
+
+#define KFeatureIdFfAnykeyPcfwNgiCheck                      5157 
+
+#define KFeatureIdFfAtntAtCommands                          5200 
+
+#define KFeatureIdFfAttAddressBk                            5240 
+
+#define KFeatureIdFfAttAddressBkGroupSync                   5250 
+
+#define KFeatureIdFfAttVideoShareUiComplianceFor323         5196 
+
+#define KFeatureIdFfAutomaticDisplayOrientation             5137 
+
+#define KFeatureIdFfAvcDisplayMipSupport                    5219 
+
+#define KFeatureIdFfAvcDisplayOledLowpowerSupport           5221 
+
+#define KFeatureIdFfCDriveAsLowestPriority                  5249 
+
+#define KFeatureIdFfCallRestriction                         5218 
+
+#define KFeatureIdFfCameraLaunchWithCameraKey               5176 
+
+#define KFeatureIdFfCameraPda                               5131 
+
+#define KFeatureIdFfCarrierProfileLocked                    5206 
+
+#define KFeatureIdFfChinaRichDictionary                     5150 
+
+#define KFeatureIdFfChinaUdx                                5172 
+
+#define KFeatureIdFfChinauiMsgMgnt                          5143 
+
+#define KFeatureIdFfChipmunk                                5163 
+
+#define KFeatureIdFfCmccTdAppMenus                          5252 
+
+#define KFeatureIdFfCmccUserPlmn                            5258 
+
+#define KFeatureIdFfCommonSlide                             5214 
+
+#define KFeatureIdFfCommunityTmoIntl                        5222 
+
+#define KFeatureIdFfContactsCompanyNames                    236 
+
+#define KFeatureIdFfContactsbarCcaEventHistoryTab           5244 
+
+#define KFeatureIdFfContactsbarEmail                        5193 
+
+#define KFeatureIdFfContactsbarImPresence                   5194 
+
+#define KFeatureIdFfContactsbarOnecontactWidget             5245 
+
+#define KFeatureIdFfContactsbarRssFeeds                     5192 
+
+#define KFeatureIdFfContactsbarUseContactColour             5191 
+
+#define KFeatureIdFfContactsbarUseDetailsApp                5188 
+
+#define KFeatureIdFfContactsbarWidget                       5246 
+
+#define KFeatureIdFfCsw9wayScrolling                        5140 
+
+#define KFeatureIdFfCswPimLocationIntegration               5153 
+
+#define KFeatureIdFfDeviceEncryptionFotaDisable             5164 
+
+#define KFeatureIdFfDeviceEncryptionFotaSupport             5179 
+
+#define KFeatureIdFfDualDisplaySupport                      5132 
+
+#define KFeatureIdFfDynamicContentDelivery                  5205 
+
+#define KFeatureIdFfEmailPluginHelpNotAvailable             5152 
+
+#define KFeatureIdFfEnablePrintingFramework                 5127 
+
+#define KFeatureIdFfEsAdvancedWizard                        5122 
+
+#define KFeatureIdFfEsCalMeetingRequestUi                   5130 
+
+#define KFeatureIdFfEsContactServices                       5093 
+
+#define KFeatureIdFfEsContacts                              5092 
+
+#define KFeatureIdFfEsEmailIntellisync                      5119 
+
+#define KFeatureIdFfEsEmailMceIntegration                   5097 
+
+#define KFeatureIdFfEsGenericUiComponents                   5121 
+
+#define KFeatureIdFfEsMeetingRequestUi                      5091 
+
+#define KFeatureIdFfEsUsbModem                              5096 
+
+#define KFeatureIdFfExchangeActivesync                      5111 
+
+#define KFeatureIdFfFaceDetection                           5181 
+
+#define KFeatureIdFfFindAndDo                               5178 
+
+#define KFeatureIdFfFingerprinthandlerUi                    5236 
+
+#define KFeatureIdFfFsCalendarLocation                      5171 
+
+#define KFeatureIdFfGpsKeyLed                               5162 
+
+#define KFeatureIdFfHomeScreenVanityDialing                 5098 
+
+#define KFeatureIdFfHomescreenNotificationWidget            5235 
+
+#define KFeatureIdFfImsDeregistrationInOfflineFor323        5203 
+
+#define KFeatureIdFfImsDeregistrationInRfsFor323            5202 
+
+#define KFeatureIdFfIntelligentSlide                        5213 
+
+#define KFeatureIdFfMediaKey                                5220 
+
+#define KFeatureIdFfMessageBoard                            5227 
+
+#define KFeatureIdFfMessagingSplitView                      5133 
+
+#define KFeatureIdFfMobileShareInMyStuff                    5199 
+
+#define KFeatureIdFfMobiledictionary                        5116 
+
+#define KFeatureIdFfMyfavesTmoUs                            5223 
+
+#define KFeatureIdFfNativeFileEncryption                    5106 
+
+#define KFeatureIdFfNonFsMail                               5124 
+
+#define KFeatureIdFfPhoneasmodemQuickLink                   5190 
+
+#define KFeatureIdFfPhotosPdaEnhancements                   5141 
+
+#define KFeatureIdFfPopupClock                              5173 
+
+#define KFeatureIdFfProductIncludesPa50                     5177 
+
+#define KFeatureIdFfQtBearerManagement                      319 
+
+#define KFeatureIdFfRcs                                     5247 
+
+#define KFeatureIdFfRsswidgetAdvertiserWidget               5248 
+
+#define KFeatureIdFfRsswidgetTemplate                       5242 
+
+#define KFeatureIdFfS60CustomSwWelcome2                     5149 
+
+#define KFeatureIdFfSearchSw                                321 
+
+#define KFeatureIdFfSensorBasedSilencing                    5175 
+
+#define KFeatureIdFfSettingsSplitView                       5134 
+
+#define KFeatureIdFfSettingwizard6                          5160 
+
+#define KFeatureIdFfSkype                                   229 
+
+#define KFeatureIdFfSliderLandscapeStartsApp                5126 
+
+#define KFeatureIdFfSmallScreenTouch                        279 
+
+#define KFeatureIdFfSmsSelfRegistration                     5207 
+
+#define KFeatureIdFfSocialPhonebook                         5215 
+
+#define KFeatureIdFfSpeechUseWebDownload                    5226 
+
+#define KFeatureIdFfSwitchProfiletransferDisabled           5139 
+
+#define KFeatureIdFfSyncStatusCheckEnabled                  5142 
+
+#define KFeatureIdFfTakeMeHome                              5161 
+
+#define KFeatureIdFfTouchscreenKeyfeedback                  5174 
+
+#define KFeatureIdFfTutorialNoCoverDisplayContent           5144 
+
+#define KFeatureIdFfUifwBackgroundOffsetAdjustmentForSplitview  5147 
+
+#define KFeatureIdFfUifwListboxHighlightSelection           5146 
+
+#define KFeatureIdFfVoiceUiWithDeviceLock                   5170 
+
+#define KFeatureIdFotaEnterpriseControl                     5123 
+
+#define KFeatureIdMsgForwardWithSender                      5239 
+
+#define KFeatureIdMuteNotificationTones                     5070
+
+#define KFeatureIdPrintingFrameworkCalendarPlugin           5057 
+
+#define KFeatureIdPrintingFrameworkContactsPlugin           5058 
+
+#define KFeatureIdPrintingFrameworkHelp                     5054 
+
+#define KFeatureIdPrintingFrameworkMmsPlugin                5056 
+
+#define KFeatureIdPrintingFrameworkSmsPlugin                5055 
+
+#define KFeatureIdProductIncludesHomeScreenDeviceLockView   5086 
+
+#define KFeatureIdProductIncludesHomeScreenModes            5084 
+
+#define KFeatureIdProductIncludesUsch                       5117 
+
+#define KFeatureIdProductIncludesVoipRel30                  5088 
+
+#define KFeatureIdProductIncludesWlanWizardForActiveIdle    5060 
+
+#define KFeatureIdS60CustomSwTutorialAlwaysPortrait         5125 
+
+#define KFeatureIdS60CustomSwWelcome                        5151
+
+#define KFeatureIdS60NokiaFarsiCalendar                     5187 
+
+#define KFeatureIdS60NokiaHijriCalendar                     5186
+
+#define KFeatureIdS60NokiaMobilecrashSender2                5155
+
+#define KPrivacyDisclaimerFtrEnabled                        5257
+
+#define KFeatureIdFfSipNonstandardInteropfix                5259
+
 #endif // __PRIVATERUNTIMEIDS_HRH
--- a/foundation_system/sf_config/config/inc/publicruntimeids.hrh	Thu Sep 02 21:44:50 2010 +0300
+++ b/foundation_system/sf_config/config/inc/publicruntimeids.hrh	Fri Sep 03 14:30:00 2010 +0100
@@ -15,6 +15,7 @@
 *
 */
 
+
 #ifndef __PUBLICRUNTIMEIDS_HRH
 #define __PUBLICRUNTIMEIDS_HRH
 
@@ -22,54 +23,116 @@
 
 #define KFeatureIdFf3gCellbroadcast                         175
 
+#define KFeatureIdFfAbcAgressiveUi                          252
+
 #define KFeatureIdFfAdaptiveWlanScanningSupport             140
 
+#define KFeatureIdFfAdditionalFonts                         241
+
 #define KFeatureIdFfAiWlansnifferWidget                     172
 
+#define KFeatureIdFfAlternativeCallWaitingTone              315
+
+#define KFeatureIdArabicHandwritingRecognitionInput         338
+
 #define KFeatureIdAsynchFileSaveQueue                       1703
 
 #define KFeatureIdFfAudt                                    63
 
+#define KFeatureIdFfAutomotivestack                         330
+
 #define KFeatureIdAutoRedialForVideoCall                    1723
 
 #define KFeatureIdFfAvkonEmotionIconEnabled                 211
 
 #define KFeatureIdFfBirthdayImprovement                     189
 
+#define KFeatureIdFfBluetoothDataProfilesDisabled           271
+
+#define KFeatureIdFfBluetoothDisabled                       270
+
 #define KFeatureIdBrowserProgressiveDownload                1724
 
+#define KFeatureIdFfCalDayView                              306
+
+#define KFeatureIdFfCalScrollablePreview                    307
+
+#define KFeatureIdFfCalMeetingRequestUi                     296
+
 #define KFeatureIdFfCapacitiveDisplay                       183
 
 #define KFeatureIdChineseFontsHires                         138
 
+#define KFeatureIdFfChineseSelectionKey                     233
+
 #define KFeatureIdFfClockMultiprocolSupport                 190
 
+#define KFeatureIdFfCmailIntegration                        247
+
 #define KFeatureIdCommsDatCreationFromXml                   67
 
 #define KFeatureIdFfConnectionOverride                      179
 
+#define KFeatureIdFfContactsCompanyNames                    236
+
+#define KFeatureIdFfContactsMerge                           268
+
+#define KFeatureIdffContactsMycard                          267
+
 #define KFeatureIdFfContactsNickname                        182
 
+#define KFeatureIdFfContactsPredictiveSearch                235
+
+#define KFeatureIdFfContactsRemoteLookup                    234
+
+#define KFeatureIdFfContactsSocial                          273
+
+#define KFeatureIdFfContextProfiles                         254
+
+#define KFeatureIdFfDeviceEncryptionFeature                 250
+
+#define KFeatureIdFfDisableOmaSuplV2                        308
+
+#define KFeatureIdFfDmConnmoAdapter                         277
+
 #define KFeatureIdDmInstallSecurity                         5065
 
 #define KFeatureIdFfDualLanguageSupport                     194
 
+#define KFeatureIdDualModem                                 230
+
 #define KFeatureIdFfEmailFramework                          135
 
+#define KFeatureIdFfEmailFullscreenviewer                   325
+
 #define KFeatureIdFfEmailIpsServices                        137
 
 #define KFeatureIdEmailMceIntegration                       126
 
+#define KFeatureIdFfEmailPredictivesearch                   324
+
 #define KFeatureIdFfEmailProtocolPlugins                    215
 
 #define KFeatureIdFfEmailUi                                 136
 
+#define KFeatureIdFfEmailUiSplitscreen                      323
+
+#define KFeatureIdEnableIsiCommunicationInUsbChargingMode   309
+
+#define KFeatureIdFfEnhancedCalendarEventUi                 295
+
 #define KFeatureIdFfFarsiCalendar                           213
 
 #define KFeatureIdFmtx                                      1705
 
+#define KFeatureIdFfFmtxRdsText                             220
+
+#define KFeatureIdFfFotaCheckLimitation                     326
+
 #define KFeatureIdFullscrHwrInput                           66
 
+#define KFeatureIdFfGenericAccessNetwork                    257
+
 #define KFeatureIdFfGenericFontsAssets                      188
 
 #define KFeatureIdFfHdmi                                    169
@@ -86,20 +149,40 @@
 
 #define KFeatureIdFfIaupdatePhase2                          185
 
+#define KFeatureIdFfImageEditor                             255
+
 #define KFeatureIdFfInputsPerOrientation                    192
 
 #define KFeatureIdFfIntelligentTextInput                    216
 
+#define KFeatureIdFfIpsecUmaSupportEnable                   332
+
+#define KFeatureIdFfItiVirtualTouchFirstGenerationSupport   218
+
 #define KFeatureIdFfJavaGlobalIndicatorsApi                 134
 
+#define KFeatureIdFfKeypadNoSendKey                         278
+
 #define KFeatureIdKorean                                    180
 
+#define KFeatureIdFfLayout480640Vga3                        240
+
+#define KFeatureIdFfLayout640480Vga3                        239
+
+#define KFeatureIdFfLimitedMessageAndAlarmToneSize          300
+
 #define KFeatureIdFfLinkedFontsChinese                      159
 
+#define KFeatureIdFfLocationMwApeCentricArchSupport         258
+
+#define KFeatureIdFfMecoXmpp                                232
+
 #define KFeatureIdFfMeetingRequestUi                        174
 
 #define KFeatureIdFfMenuTexturePreloading                   118
 
+#define KFeatureIdS60MtpController                          272
+
 #define KFeatureIdFfNcdEngine                               61
 
 #define KFeatureIdFfNcdUi                                   62
@@ -116,10 +199,16 @@
 
 #define KFeatureIdFfOfnFeature                              193
 
+#define KFeatureIdFfOmadrm1FullSupport                      329
+
+#define KFeatureIdFfOmadrm2Support                          328
+
 #define KFeatureIdFfOmaScomoAdapter                         197
 
 #define KFeatureIdFfOssLegalNotice                          196
 
+#define KFeatureIdFfPlayreadySupport                        322
+
 #define KFeatureIdFfPnpmsProvFilter                         133
 
 #define KFeatureIdPnpmsServiceHelpPlugin                    128
@@ -130,6 +219,8 @@
 
 #define KFeatureIdProvAuthtypePlugin                        100
 
+#define KFeatureIdFfQt                                      238
+
 #define KFeatureIdQwertyFnKey                               1714
 
 #define KFeatureIdRockerKey                                 120
@@ -138,18 +229,50 @@
 
 #define KFeatureIdSelectableEmail                           125
 
+#define KFeatureIdFfSidesliderSupport                       320
+
+#define KFeatureIdFfSimConsecutive6f00ErrorsHandling        327
+
+#define KFeatureIdFfSipApnSwitching                         318
+
+#define KFeatureIdFfSipCustomPdpHandling                    269
+
+#define KFeatureIdFfSmallScreenTouch                        279
+
 #define KFeatureStartupOmaDmSupport                         40
 
+#define KFeatureIdFfStrokeInputmodeInTaiwan                 280
+
+#define KFeatureIdFfSuplImsiGeneratedServerPriorityDefault  301
+
+#define KFeatureIdFfSyncmlStatusExtendedErrorCodes          299
+
 #define KFeatureIdFfTacticons                               184
 
 #define KFeatureIdTactileFeedback                           1718
 
 #define KFeatureIdFfTarmCapabilityBasedAccess               214
 
+#define KFeatureIdFfTarmCapabilityChecking                  237
+
 #define KFeatureIdTcpMyfavesFeature                         1722
 
 #define KFeatureIdFfTcpMyprofile                            186
 
+#define KFeatureIdFfTdClmcontactreplicationfromphonebooktousimcard  337
+
+#define KFeatureIdFfTdCmccatcommandssupport                 336
+
+#define KFeatureIdFfTdCmccpimpromptserverfullwhenreceive420statuscodefromserver  335
+
+#define KFeatureIdFfTdCmccpimsynchronizationprogressindicatorui   334
+
+#define KFeatureIdFfTdScdma                                 274
+
+#define KFeatureIdFfTdScdmaForbiddenoperatoricondisplay     316
+
+#define KFeatureIdFfTdScdmaVideocallKey                     317
+
 #define KFeatureIdTouchscreencalibInStartup                 69
 
 #define KFeatureIdFfTouchUnlockStroke                       173
@@ -160,8 +283,16 @@
 
 #define KFeatureIdUsbHost                                   1704
 
+#define KFeatureIdUsbModem                                  265
+
 #define KFeatureIdUseEGprsIcon                              121
 
+#define KFeatureIdFfUseNavikeyForVolume                     248
+
+#define KFeatureIdFfVideoAudioBranding                      266
+
+#define KFeatureIdFfVideoEditor                             256
+
 #define KFeatureIdVirtualFullscrQwertyInput                 64
 
 #define KFeatureIdVirtualItutInput                          65
@@ -174,12 +305,20 @@
 
 #define KFeatureIdWebvideoPh2                               39
 
-#define KFeatureIdFfWlansnifferVoipEnhancements             156
+#define KFeatureIdFfWlanAuthenticationOnlySupport           314
 
 #define KFeatureIdFfWlanExtensions                          177
 
 #define KFeatureIdFfWlanWapi                                129
 
+#define KFeatureIdFfWmdrmDlaSupport                         310
+
+#define KFeatureIdSymbianIncludeLocationNpeDsm              261
+
+#define KFeatureIdSymbianIncludeLocationSuplPosInit         263
+
+#define KFeatureIdSymbianIncludeLocationSuplProxy           262
+
 #define KFeatureId3DMenu                                    1511
 
 #define KFeatureId3GpExtension                              1592
@@ -508,4 +647,38 @@
 
 #define KFeatureIdXdmXcap                                   1524
 
+/** Features added from customswruntimeids.hrh (removed from customswruntimeids.hrh)  */
+
+#define KFeatureIdFfMtpAlbumArt                             5229
+
+#define KFeatureIdFfMusicPathPlugin                         5232
+
+#define KFeatureIdFfPowerKeyAsKeyguard                      5243
+
+#define KFeatureIdFfDisplayNetworkNameAfterCsRegistration   5217
+
+#define KFeatureIdFfManualSelectionPopulatedPlmnList        5184
+
+#define KFeatureIdFfMobilityManagementErrors                5228
+
+#define KFeatureIdFfServiceCallWhilePhoneLocked             5198
+
+#define KFeatureIdFfLocationsysuiHidePositioningMenu        5224
+
+#define KFeatureIdFfMasterResetAndClearSubmenu              5195
+
+#define KFeatureIdFfSimlockUi                               5197
+
+#define KFeatureIdFfEntryPointForVideoShare                 5225
+
+#define KFeatureIdFfImsDeregistrationInOffline              5230
+
+#define KFeatureIdFfImsDeregistrationInRfs                  5231
+
+#define KFeatureIdFfImsDeregistrationInVpn                  5209
+
+#define KFeatureIdFfIntranetBrowsing                        5109
+
+#define KFeatureIdProductIncludesHomeScreenEasyDialing      5085
+
 #endif // __PUBLICRUNTIMEIDS_HRH
--- a/foundation_system/sf_config/config/inc/variant.cfg	Thu Sep 02 21:44:50 2010 +0300
+++ b/foundation_system/sf_config/config/inc/variant.cfg	Fri Sep 03 14:30:00 2010 +0100
@@ -1,1 +1,2 @@
 \epoc32\include\bldvariant.hrh
+ENABLE_ABIV2_MODE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/foundation_system/sf_config/sbs/group/bld.inf	Fri Sep 03 14:30:00 2010 +0100
@@ -0,0 +1,20 @@
+/*
+* Copyright (c) 2009 Symbian Foundation Ltd
+* 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:
+* Symbian Foundation Ltd - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* Exports Foundation s60_sbs_config.xml
+*/
+
+
+PRJ_EXPORTS
+// SBSv2 configuration file
+../s60_sbs_config.xml               /epoc32/sbs_config/s60_sbs_config.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/foundation_system/sf_config/sbs/s60_sbs_config.xml	Fri Sep 03 14:30:00 2010 +0100
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<build xmlns="http://symbian.com/xml/build"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://symbian.com/xml/build build/2_0.xsd">
+
+	<!-- End-user overrides for existing build configurations for SBSv2 (aka Raptor).-->
+
+	<!-- binding of FLM interfaces to certain build/makefile phase to ensure proper order of execution during build -->
+	<var name="make_changes">
+		<set name="bitmap.selector.iface" value="\.(bitmap|extension|mifconv|akniconinterfaces|removegtfiles|skingenerator|cryptoprep|builder|help_files|version_update)$"/>
+		<set name="resource.selector.iface" value="\.(resource|extension|mif2cdlindex|nativejava|genericcopy)$"/>
+		<set name="default.selector.iface" value="\.(?!export$|bitmap$|resource$|mifconv$|mif2cdlindex$|nativejava$|akniconinterfaces$|removegtfiles$|genericcopy$|skingenerator$|cryptoprep$|builder$|help_files$|version_update$).*$"/>
+		<!-- 4.5 min -->
+		<set name='TALON_TIMEOUT' value='900000'/> 
+	</var>
+
+	<!-- emake -->
+	<alias name="emake" meaning="emake_engine.make_changes"/>  
+
+	<!-- gnu make -->
+	<alias name="make" meaning="make_engine.make_changes"/>
+
+	<var name="permissive">
+		<append name="CC_ERRORS_CONTROL_OPTION" value="-fpermissive"/>
+	</var>
+</build>