Merge Imaker changes, fixes for bugs 2616 and 2692. RCL_3
authorPat Downey <patd@symbian.org>
Tue, 18 May 2010 17:16:07 +0100
branchRCL_3
changeset 49 d041c81b30f9
parent 47 2d8b94809fbe (current diff)
parent 44 2d2fd482dda9 (diff)
child 52 01fb6c94e199
Merge Imaker changes, fixes for bugs 2616 and 2692.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/cenrep/group/bld.inf	Tue May 18 17:16:07 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/sf_config/cenrep/src/convert.confml	Tue May 18 17:16:07 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/sf_config/cenrep/src/convertpluginlayer/implml/assets.convertprojectml	Tue May 18 17:16:07 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/sf_config/cenrep/src/convertpluginlayer/root.confml	Tue May 18 17:16:07 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
--- a/sf_config/config/apac/inc/bldregional.hrh	Tue May 11 17:20:40 2010 +0300
+++ b/sf_config/config/apac/inc/bldregional.hrh	Tue May 18 17:16:07 2010 +0100
@@ -129,4 +129,4 @@
 #undef __THAI_CALENDAR                                     
  
 
-#endif // __BLDREGIONAL_HRH 
\ No newline at end of file
+#endif // __BLDREGIONAL_HRH 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/config/engineering/group/bld.inf	Tue May 18 17:16:07 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/sf_config/config/engineering/inc/bldregional.hrh	Tue May 18 17:16:07 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/sf_config/config/group/inc.inf	Tue May 11 17:20:40 2010 +0300
+++ b/sf_config/config/group/inc.inf	Tue May 18 17:16:07 2010 +0100
@@ -33,4 +33,6 @@
 ../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/sf_config/config/group/symbian_os_romdefs.hby	Tue May 18 17:16:07 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/sf_config/config/inc/PlatformStaticFeatures.hrh	Tue May 11 17:20:40 2010 +0300
+++ b/sf_config/config/inc/PlatformStaticFeatures.hrh	Tue May 18 17:16:07 2010 +0100
@@ -11,10 +11,15 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:  Defines Series 60 specific feature constants for common
+*                Feature Manager component. This file is included by
+*                Feature Manager component when building it.
+*                The counterpart for this file is the generic SpdStaticFeatures.hrh.
 *
 */
 
+
+
 /* 
 *
 Usage of the file in the FeatMgr/featmgrstaticfeatures.hrh:
@@ -30,4 +35,4 @@
 
 //includes domain specific Carbon generated files
 #include <PrivateStaticFeatures.hrh>
-#include <PublicStaticFeatures.hrh>
\ No newline at end of file
+#include <PublicStaticFeatures.hrh>
--- a/sf_config/config/inc/PrivateStaticFeatures.hrh	Tue May 11 17:20:40 2010 +0300
+++ b/sf_config/config/inc/PrivateStaticFeatures.hrh	Tue May 18 17:16:07 2010 +0100
@@ -15,6 +15,7 @@
 *
 */
 
+
 #ifdef FF_M3G_ICON_RESOURCES
 KFeatureIdM3gIconResources,
 #endif
--- a/sf_config/config/inc/ProductVariant.hrh	Tue May 11 17:20:40 2010 +0300
+++ b/sf_config/config/inc/ProductVariant.hrh	Tue May 18 17:16:07 2010 +0100
@@ -13,8 +13,20 @@
 *
 * Description: 
 *
+*  The file is included by any code (cpp and resource) that needs to
+*  have static (compilation time, link time, image build time) or
+*  dynamic (run time) variation support for variant specific features.
+*
+*  This file is meant for licensees to customize the default variability
+*  settings configured for the release. The existing values can overridden
+*  in this file by defining/undefining feature flags.
+*
+*
+*
 */
 
+
+
 #ifndef PRODUCTVARIANT_HRH
 #define PRODUCTVARIANT_HRH
 
--- a/sf_config/config/inc/PublicStaticFeatures.hrh	Tue May 11 17:20:40 2010 +0300
+++ b/sf_config/config/inc/PublicStaticFeatures.hrh	Tue May 18 17:16:07 2010 +0100
@@ -15,6 +15,7 @@
 *
 */
 
+
 #ifdef FF_3D_RINGING_TONES
 KFeatureId3DRingingTones,
 #endif
@@ -23,14 +24,30 @@
 KFeatureIdFf3gCellbroadcast,
 #endif
 
+#ifdef FF_ABC_AGRESSIVE_UI
+KFeatureIdFfAbcAgressiveUi,
+#endif
+
 #ifdef FF_ADAPTIVE_WLAN_SCANNING_SUPPORT
 KFeatureIdFfAdaptiveWlanScanningSupport,
 #endif
 
+#ifdef FF_ADDITIONAL_FONTS
+KFeatureIdFfAdditionalFonts,
+#endif
+
 #ifdef FF_AI_WLANSNIFFER_WIDGET
 KFeatureIdFfAiWlansnifferWidget,
 #endif
 
+#ifdef FF_ALTERNATIVE_CALL_WAITING_TONE
+KFeatureIdFfAlternativeCallWaitingTone,
+#endif
+
+#ifdef FF_ARABIC_HANDWRITING_RECOGNITION_INPUT
+KFeatureIdArabicHandwritingRecognitionInput,
+#endif
+
 #ifdef FF_ASYNCH_FILE_SAVE_QUEUE
 KFeatureIdAsynchFileSaveQueue,
 #endif
@@ -39,6 +56,10 @@
 KFeatureIdFfAudt,
 #endif
 
+#ifdef FF_AUTOMOTIVESTACK
+KFeatureIdFfAutomotivestack,
+#endif
+
 #ifdef FF_AUTO_REDIAL_FOR_VIDEO_CALL
 KFeatureIdAutoRedialForVideoCall,
 #endif
@@ -51,10 +72,30 @@
 KFeatureIdFfBirthdayImprovement,
 #endif
 
+#ifdef FF_BLUETOOTH_DATA_PROFILES_DISABLED
+KFeatureIdFfBluetoothDataProfilesDisabled,
+#endif
+
+#ifdef FF_BLUETOOTH_DISABLED
+KFeatureIdFfBluetoothDisabled,
+#endif
+
 #ifdef FF_BROWSER_PROGRESSIVE_DOWNLOAD
 KFeatureIdBrowserProgressiveDownload,
 #endif
 
+#ifdef FF_CALENDAR_DAY_VIEW
+KFeatureIdFfCalDayView,
+#endif
+
+#ifdef FF_CALENDAR_SCROLLABLE_PREVIEW
+KFeatureIdFfCalScrollablePreview,
+#endif
+
+#ifdef FF_CAL_MEETING_REQUEST_UI
+KFeatureIdFfCalMeetingRequestUi,
+#endif
+
 #ifdef FF_CAPACITIVE_DISPLAY
 KFeatureIdFfCapacitiveDisplay,
 #endif
@@ -63,10 +104,18 @@
 KFeatureIdChineseFontsHires,
 #endif
 
+#ifdef FF_CHINESE_SELECTION_KEY
+KFeatureIdFfChineseSelectionKey,
+#endif
+
 #ifdef FF_CLOCK_MULTIPROCOL_SUPPORT
 KFeatureIdFfClockMultiprocolSupport,
 #endif
 
+#ifdef FF_CMAIL_INTEGRATION
+KFeatureIdFfCmailIntegration,
+#endif
+
 #ifdef FF_COMMSDAT_CREATION_FROM_XML
 KFeatureIdCommsDatCreationFromXml,
 #endif
@@ -75,10 +124,50 @@
 KFeatureIdFfConnectionOverride,
 #endif
 
+#ifdef FF_CONTACTS_COMPANY_NAMES
+KFeatureIdFfContactsCompanyNames,
+#endif
+
+#ifdef FF_CONTACTS_MERGE
+KFeatureIdFfContactsMerge,
+#endif
+
+#ifdef FF_CONTACTS_MYCARD
+KFeatureIdffContactsMycard,
+#endif
+
 #ifdef FF_CONTACTS_NICKNAME
 KFeatureIdFfContactsNickname,
 #endif
 
+#ifdef FF_CONTACTS_PREDICTIVE_SEARCH
+KFeatureIdFfContactsPredictiveSearch,
+#endif
+
+#ifdef FF_CONTACTS_REMOTE_LOOKUP
+KFeatureIdFfContactsRemoteLookup,
+#endif
+
+#ifdef FF_CONTACTS_SOCIAL
+KFeatureIdFfContactsSocial,
+#endif
+
+#ifdef FF_CONTEXT_PROFILES
+KFeatureIdFfContextProfiles,
+#endif
+
+#ifdef FF_DEVICE_ENCRYPTION_FEATURE
+KFeatureIdFfDeviceEncryptionFeature,
+#endif
+
+#ifdef FF_DISABLE_OMA_SUPL_V2
+KFeatureIdFfDisableOmaSuplV2,
+#endif
+
+#ifdef FF_DM_CONNMO_ADAPTER
+KFeatureIdFfDmConnmoAdapter,
+#endif
+
 #ifdef FF_DM_INSTALL_SECURITY
 KFeatureIdDmInstallSecurity,
 #endif
@@ -87,10 +176,18 @@
 KFeatureIdFfDualLanguageSupport,
 #endif
 
+#ifdef FF_DUAL_MODEM
+KFeatureIdDualModem,
+#endif
+
 #ifdef FF_EMAIL_FRAMEWORK
 KFeatureIdFfEmailFramework,
 #endif
 
+#ifdef FF_EMAIL_FULLSCREENVIEWER
+KFeatureIdFfEmailFullscreenviewer,
+#endif
+
 #ifdef FF_EMAIL_IPS_SERVICES
 KFeatureIdFfEmailIpsServices,
 #endif
@@ -99,6 +196,10 @@
 KFeatureIdEmailMceIntegration,
 #endif
 
+#ifdef FF_EMAIL_PREDICTIVESEARCH
+KFeatureIdFfEmailPredictivesearch,
+#endif
+
 #ifdef FF_EMAIL_PROTOCOL_PLUGINS
 KFeatureIdFfEmailProtocolPlugins,
 #endif
@@ -107,6 +208,18 @@
 KFeatureIdFfEmailUi,
 #endif
 
+#ifdef FF_EMAIL_UI_SPLITSCREEN
+KFeatureIdFfEmailUiSplitscreen,
+#endif
+
+#ifdef FF_ENABLE_ISI_COMMUNICATION_IN_USB_CHARGING_MODE
+KFeatureIdEnableIsiCommunicationInUsbChargingMode,
+#endif
+
+#ifdef FF_ENHANCED_CALENDAR_EVENT_UI
+KFeatureIdFfEnhancedCalendarEventUi,
+#endif
+
 #ifdef FF_FARSI_CALENDAR
 KFeatureIdFfFarsiCalendar,
 #endif
@@ -115,10 +228,22 @@
 KFeatureIdFmtx,
 #endif
 
+#ifdef FF_FMTX_RDS_TEXT
+KFeatureIdFfFmtxRdsText,
+#endif
+
+#ifdef FF_FOTA_CHECK_LIMITATION
+KFeatureIdFfFotaCheckLimitation,
+#endif
+
 #ifdef FF_FULLSCR_HWR_INPUT
 KFeatureIdFullscrHwrInput,
 #endif
 
+#ifdef FF_GENERIC_ACCESS_NETWORK
+KFeatureIdFfGenericAccessNetwork,
+#endif
+
 #ifdef FF_GENERIC_FONTS_ASSETS
 KFeatureIdFfGenericFontsAssets,
 #endif
@@ -151,6 +276,10 @@
 KFeatureIdFfIaupdatePhase2,
 #endif
 
+#ifdef FF_IMAGE_EDITOR
+KFeatureIdFfImageEditor,
+#endif
+
 #ifdef FF_INPUTS_PER_ORIENTATION
 KFeatureIdFfInputsPerOrientation,
 #endif
@@ -159,18 +288,50 @@
 KFeatureIdFfIntelligentTextInput,
 #endif
 
+#ifdef FF_IPSEC_UMA_SUPPORT_ENABLE
+KFeatureIdFfIpsecUmaSupportEnable,
+#endif
+
+#ifdef FF_ITI_VIRTUAL_TOUCH_FIRST_GENERATION_SUPPORT
+KFeatureIdFfItiVirtualTouchFirstGenerationSupport,
+#endif
+
 #ifdef FF_JAVA_GLOBAL_INDICATORS_API
 KFeatureIdFfJavaGlobalIndicatorsApi,
 #endif
 
+#ifdef FF_KEYPAD_NO_SEND_KEY
+KFeatureIdFfKeypadNoSendKey,
+#endif
+
 #ifdef FF_KOREAN
 KFeatureIdKorean,
 #endif
 
+#ifdef FF_LAYOUT_480_640_VGA3
+KFeatureIdFfLayout480640Vga3,
+#endif
+
+#ifdef FF_LAYOUT_640_480_VGA3
+KFeatureIdFfLayout640480Vga3,
+#endif
+
+#ifdef FF_LIMITED_MESSAGE_AND_ALARM_TONE_SIZE
+KFeatureIdFfLimitedMessageAndAlarmToneSize,
+#endif
+
 #ifdef FF_LINKED_FONTS_CHINESE
 KFeatureIdFfLinkedFontsChinese,
 #endif
 
+#ifdef FF_LOCATION_MW_APE_CENTRIC_ARCH_SUPPORT
+KFeatureIdFfLocationMwApeCentricArchSupport,
+#endif
+
+#ifdef FF_MECO_XMPP
+KFeatureIdFfMecoXmpp,
+#endif
+
 #ifdef FF_MEETING_REQUEST_UI
 KFeatureIdFfMeetingRequestUi,
 #endif
@@ -179,6 +340,10 @@
 KFeatureIdFfMenuTexturePreloading,
 #endif
 
+#ifdef FF_MTP_CONTROLLER
+KFeatureIdS60MtpController,
+#endif
+
 #ifdef FF_NCD_ENGINE
 KFeatureIdFfNcdEngine,
 #endif
@@ -211,6 +376,14 @@
 KFeatureIdFfOfnFeature,
 #endif
 
+#ifdef FF_OMADRM1_FULL_SUPPORT
+KFeatureIdFfOmadrm1FullSupport,
+#endif
+
+#ifdef FF_OMADRM2_SUPPORT
+KFeatureIdFfOmadrm2Support,
+#endif
+
 #ifdef FF_OMA_SCOMO_ADAPTER
 KFeatureIdFfOmaScomoAdapter,
 #endif
@@ -219,6 +392,10 @@
 KFeatureIdFfOssLegalNotice,
 #endif
 
+#ifdef FF_PLAYREADY_SUPPORT
+KFeatureIdFfPlayreadySupport,
+#endif
+
 #ifdef FF_PNPMS_PROV_FILTER
 KFeatureIdFfPnpmsProvFilter,
 #endif
@@ -239,6 +416,10 @@
 KFeatureIdProvAuthtypePlugin,
 #endif
 
+#ifdef FF_QT
+KFeatureIdFfQt,
+#endif
+
 #ifdef FF_QWERTY_FN_KEY
 KFeatureIdQwertyFnKey,
 #endif
@@ -255,10 +436,42 @@
 KFeatureIdSelectableEmail,
 #endif
 
+#ifdef FF_SIDESLIDER_SUPPORT
+KFeatureIdFfSidesliderSupport,
+#endif
+
+#ifdef FF_SIM_CONSECUTIVE_6F00_ERRORS_HANDLING
+KFeatureIdFfSimConsecutive6f00ErrorsHandling,
+#endif
+
+#ifdef FF_SIP_APN_SWITCHING
+KFeatureIdFfSipApnSwitching,
+#endif
+
+#ifdef FF_SIP_CUSTOM_PDP_HANDLING
+KFeatureIdFfSipCustomPdpHandling,
+#endif
+
+#ifdef FF_SMALL_SCREEN_TOUCH
+KFeatureIdFfSmallScreenTouch,
+#endif
+
 #ifdef FF_STARTUP_OMA_DM_SUPPORT
 KFeatureStartupOmaDmSupport,
 #endif
 
+#ifdef FF_STROKE_INPUTMODE_IN_TAIWAN
+KFeatureIdFfStrokeInputmodeInTaiwan,
+#endif
+
+#ifdef FF_SUPL_IMSI_GENERATED_SERVER_PRIORITY_DEFAULT
+KFeatureIdFfSuplImsiGeneratedServerPriorityDefault,
+#endif
+
+#ifdef FF_SYNCML_STATUS_EXTENDED_ERROR_CODES
+KFeatureIdFfSyncmlStatusExtendedErrorCodes,
+#endif
+
 #ifdef FF_TACTICONS
 KFeatureIdFfTacticons,
 #endif
@@ -271,6 +484,10 @@
 KFeatureIdFfTarmCapabilityBasedAccess,
 #endif
 
+#ifdef FF_TARM_CAPABILITY_CHECKING
+KFeatureIdFfTarmCapabilityChecking,
+#endif
+
 #ifdef FF_TCP_MYFAVES_FEATURE
 KFeatureIdTcpMyfavesFeature,
 #endif
@@ -279,6 +496,34 @@
 KFeatureIdFfTcpMyprofile,
 #endif
 
+#ifdef FF_TD_CLMContactReplicationFromPhonebookToUSIMCard
+KFeatureIdFfTdClmcontactreplicationfromphonebooktousimcard,
+#endif
+
+#ifdef FF_TD_CMCCATCommandsSupport
+KFeatureIdFfTdCmccatcommandssupport,
+#endif
+
+#ifdef FF_TD_CMCCPIMPromptServerFullWhenReceive420StatusCodeFromServer
+KFeatureIdFfTdCmccpimpromptserverfullwhenreceive420statuscodefromserver,
+#endif
+
+#ifdef FF_TD_CMCCPIMSynchronizationProgressIndicatorUI 
+KFeatureIdFfTdCmccpimsynchronizationprogressindicatorui ,
+#endif
+
+#ifdef FF_TD_SCDMA
+KFeatureIdFfTdScdma,
+#endif
+
+#ifdef FF_TD_SCDMA_FORBIDDENOPERATORICONDISPLAY
+KFeatureIdFfTdScdmaForbiddenoperatoricondisplay,
+#endif
+
+#ifdef FF_TD_SCDMA_VIDEOCALL_KEY
+KFeatureIdFfTdScdmaVideocallKey,
+#endif
+
 #ifdef FF_TOUCHSCREENCALIB_IN_STARTUP
 KFeatureIdTouchscreencalibInStartup,
 #endif
@@ -299,10 +544,26 @@
 KFeatureIdUsbHost,
 #endif
 
+#ifdef FF_USB_MODEM
+KFeatureIdUsbModem,
+#endif
+
 #ifdef FF_USE_EGPRS_ICON
 KFeatureIdUseEGprsIcon,
 #endif
 
+#ifdef FF_USE_NAVIKEY_FOR_VOLUME
+KFeatureIdFfUseNavikeyForVolume,
+#endif
+
+#ifdef FF_VIDEO_AUDIO_BRANDING
+KFeatureIdFfVideoAudioBranding,
+#endif
+
+#ifdef FF_VIDEO_EDITOR
+KFeatureIdFfVideoEditor,
+#endif
+
 #ifdef FF_VIRTUAL_FULLSCR_QWERTY_INPUT
 KFeatureIdVirtualFullscrQwertyInput,
 #endif
@@ -327,8 +588,8 @@
 KFeatureIdWebvideoPh2,
 #endif
 
-#ifdef FF_WLANSNIFFER_VOIP_ENHANCEMENTS
-KFeatureIdFfWlansnifferVoipEnhancements,
+#ifdef FF_WLAN_AUTHENTICATION_ONLY_SUPPORT
+KFeatureIdFfWlanAuthenticationOnlySupport,
 #endif
 
 #ifdef FF_WLAN_EXTENSIONS
@@ -339,6 +600,22 @@
 KFeatureIdFfWlanWapi,
 #endif
 
+#ifdef FF_WMDRM_DLA_SUPPORT
+KFeatureIdFfWmdrmDlaSupport,
+#endif
+
+#ifdef SYMBIAN_INCLUDE_LOCATION_NPE_DSM
+KFeatureIdSymbianIncludeLocationNpeDsm,
+#endif
+
+#ifdef SYMBIAN_INCLUDE_LOCATION_SUPL_POS_INIT
+KFeatureIdSymbianIncludeLocationSuplPosInit,
+#endif
+
+#ifdef SYMBIAN_INCLUDE_LOCATION_SUPL_PROXY
+KFeatureIdSymbianIncludeLocationSuplProxy,
+#endif
+
 #ifdef __3D_MENU
 KFeatureId3DMenu,
 #endif
@@ -995,3 +1272,68 @@
 KFeatureIdXdmXcap,
 #endif
 
+/** Features added from customswstaticfeatures.hrh (removed from customswstaticfeatures.hrh) */
+
+#ifdef FF_MTP_ALBUM_ART
+KFeatureIdFfMtpAlbumArt,
+#endif
+
+#ifdef FF_MUSIC_PATH_PLUGIN
+KFeatureIdFfMusicPathPlugin,
+#endif
+
+#ifdef FF_POWER_KEY_AS_KEYGUARD
+KFeatureIdFfPowerKeyAsKeyguard,
+#endif
+
+#ifdef FF_DISPLAY_NETWORK_NAME_AFTER_CS_REGISTRATION
+KFeatureIdFfDisplayNetworkNameAfterCsRegistration,
+#endif
+
+#ifdef FF_MANUAL_SELECTION_POPULATED_PLMN_LIST
+KFeatureIdFfManualSelectionPopulatedPlmnList,
+#endif
+
+#ifdef FF_MOBILITY_MANAGEMENT_ERRORS
+KFeatureIdFfMobilityManagementErrors,
+#endif
+
+#ifdef FF_SERVICE_CALL_WHILE_PHONE_LOCKED
+KFeatureIdFfServiceCallWhilePhoneLocked,
+#endif
+
+#ifdef FF_LOCATIONSYSUI_HIDE_POSITIONING_MENU
+KFeatureIdFfLocationsysuiHidePositioningMenu,
+#endif
+
+#ifdef FF_MASTER_RESET_AND_CLEAR_SUBMENU
+KFeatureIdFfMasterResetAndClearSubmenu,
+#endif
+
+#ifdef FF_SIMLOCK_UI
+KFeatureIdFfSimlockUi,
+#endif
+
+#ifdef FF_ENTRY_POINT_FOR_VIDEO_SHARE
+KFeatureIdFfEntryPointForVideoShare,
+#endif
+
+#ifdef FF_IMS_DEREGISTRATION_IN_OFFLINE
+KFeatureIdFfImsDeregistrationInOffline,
+#endif
+
+#ifdef FF_IMS_DEREGISTRATION_IN_RFS
+KFeatureIdFfImsDeregistrationInRfs,
+#endif
+
+#ifdef FF_IMS_DEREGISTRATION_IN_VPN
+KFeatureIdFfImsDeregistrationInVpn,
+#endif
+
+#ifdef FF_INTRANET_BROWSING
+KFeatureIdFfIntranetBrowsing,
+#endif
+
+#ifdef FF_HOME_SCREEN_EASY_DIALING
+KFeatureIdProductIncludesHomeScreenEasyDialing,
+#endif
--- a/sf_config/config/inc/bldcodeline.hrh	Tue May 11 17:20:40 2010 +0300
+++ b/sf_config/config/inc/bldcodeline.hrh	Tue May 18 17:16:07 2010 +0100
@@ -15,6 +15,7 @@
 *
 */
 
+
 #ifndef __BLDCODELINE_HRH 
 #define __BLDCODELINE_HRH 
 
@@ -58,6 +59,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. 
@@ -585,7 +592,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 +1246,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 +1421,4 @@
 #define RD_XML_ENGINE_API_CHANGE                            
  
 
-#endif // __BLDCODELINE_HRH 
\ No newline at end of file
+#endif // __BLDCODELINE_HRH
--- a/sf_config/config/inc/bldprivate.hrh	Tue May 11 17:20:40 2010 +0300
+++ b/sf_config/config/inc/bldprivate.hrh	Tue May 18 17:16:07 2010 +0100
@@ -15,6 +15,7 @@
 *
 */
 
+
 #ifndef __BLDPRIVATE_HRH 
 #define __BLDPRIVATE_HRH 
 
@@ -73,6 +74,16 @@
 */ 
 #define FF_TOUCH_CALL_HANDLING                              
  
+/** #FF_WDP_EMMC  
+Select writable demand paging eMMC flash driver build . 
+*/ 
+#undef FF_WDP_EMMC                                         
+ 
+/** #FF_WDP_NAND  
+Select writable demand paging NAND flash driver build. 
+*/ 
+#undef FF_WDP_NAND                                         
+ 
 /** #FF_WS_NCIM  
 This run-time flag is required for enableing NCIM at the run-time. 
 NCIM, here onwards called as "Nokia account".
@@ -96,6 +107,12 @@
 */ 
 #undef HLP_ADDITIONAL_CALENDAR                             
  
+/** #HLP_APAC_VARIATION  
+Flag to be used for image creation time variation -- need to separate 3G/APAC
+help variants. 
+*/ 
+#undef HLP_APAC_VARIATION                                  
+ 
 /** #HLP_CAMERA_KEY  
 USED ONLY FOR HELP CONTENT VARIATION 
 */ 
@@ -155,6 +172,35 @@
 */ 
 #define JSR_135_SUPPORT                                     
  
+/** #NO_CBCP_PARSER_IN_ROM   
+Do not include symbian CBCP parser in rom 
+*/ 
+#define NO_CBCP_PARSER_IN_ROM                               
+ 
+/** #NO_ENP_PARSER_IN_ROM  
+This feature flag can be used to not to include symbian ENP Parser into ROM
+image. 
+*/ 
+#define NO_ENP_PARSER_IN_ROM                                
+ 
+/** #NO_GFP_PARSER_IN_ROM  
+This feature flag can be used to not to include symbian GFP Parser into ROM
+image. 
+*/ 
+#define NO_GFP_PARSER_IN_ROM                                
+ 
+/** #NO_IACP_PARSER_IN_ROM  
+his feature flag can be used to not to include symbian IACP Parser into ROM
+image. 
+*/ 
+#define NO_IACP_PARSER_IN_ROM                               
+ 
+/** #NO_WAPP_PARSER_IN_ROM   
+This feature flag can be used to not to include symbian WAPP parser into ROM
+image. 
+*/ 
+#define NO_WAPP_PARSER_IN_ROM                               
+ 
 /** #RD_XML_PARSER_TOOLCHAIN  
 "Used to turn on and off the use of the arabica and xercesc components in the
 build system, and code in the layout compiler." 
@@ -198,7 +244,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 +266,44 @@
 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                     
  
+/** #SYMBIAN_EXCLUDE_FAX  
+Flag to exclude fax related binaries from images. No runtime variation, only
+used at image creation. 
+*/ 
+#undef SYMBIAN_EXCLUDE_FAX                                 
+ 
+/** #SYMBIAN_EXCLUDE_INFRARED  
+removes symbian infrared components from rom 
+*/ 
+#undef SYMBIAN_EXCLUDE_INFRARED                            
+ 
 /** #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_LIBXML2  
+This feature flag removes libxml2.dll from image. 
+*/ 
+#undef SYMBIAN_EXCLUDE_LIBXML2                             
+ 
+/** #SYMBIAN_EXCLUDE_LIBXML2_DOM_XPATH_API  
+This feature flag removes libxml2.dll from image. 
+*/ 
+#undef SYMBIAN_EXCLUDE_LIBXML2_DOM_XPATH_API               
+ 
+/** #SYMBIAN_EXCLUDE_LIBXML2_SAX_CPARSER_PLUGIN  
+This feature flag removes libxml2.dll from image. 
+*/ 
+#undef SYMBIAN_EXCLUDE_LIBXML2_SAX_CPARSER_PLUGIN          
  
 /** #SYMBIAN_EXCLUDE_LOCATION_MANAGEMENT  
 The macro SYMBIAN_EXCLUDE_LOCATION_MANAGEMENT is used to exclude the location
@@ -256,17 +328,22 @@
 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.  
 */ 
 #undef SYMBIAN_EXCLUDE_SIP                                 
  
+/** #SYMBIAN_EXCLUDE_WIFI  
+Removes Symbian wlan componets 
+*/ 
+#undef SYMBIAN_EXCLUDE_WIFI                                
+ 
 /** #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
@@ -278,7 +355,12 @@
 /** #SYMBIAN_GRAPHICS_USE_WSERV2  
 WServ2 binaries are used instead of WSERV1 versions. 
 */ 
-#define SYMBIAN_GRAPHICS_USE_WSERV2                         
+#undef SYMBIAN_GRAPHICS_USE_WSERV2                         
+ 
+/** #SYMBIAN_HAL_NONSECUREOFFSET_PERSISTENCE_DISABLED  
+Non secure offset persistence must be disabled in secure time 
+*/ 
+#define SYMBIAN_HAL_NONSECUREOFFSET_PERSISTENCE_DISABLED   1 
  
 /** #SYMBIAN_HAL_PENSTATE_PERSISTENCE_DISABLED  
 Provide an option to allow platform to not save HALData::EPenState attribute. 
@@ -420,7 +502,28 @@
 Introduced by PREQ1872.
  
 */ 
-#undef SYMBIAN_INCLUDE_USB_RNDIS                           
+#define SYMBIAN_INCLUDE_USB_RNDIS                           
+ 
+/** #SYMBIAN_MBUF_POOL_SIZE  
+The size of the MBuf pool is adjustable. The MBuf pool is used for creating
+buffers for communication data.
+
+The MBuf is configurable in c32start.ini :
+\src\common\generic\comms-infras\rootserver\etc\
+It is runtime read configuration file, e.g.:
+
+[Global]
+MBufPoolSize=<initial size>,<max size> [bytes] 
+
+Default MBufPoolSize=262144,262144.
+If single value => interpreted as max size. 
+
+When an initial size is specified the pool grows when necessary until it reaches
+the maximum size. It does not shrink, however, so the RAM is not released until
+the device is rebooted.
+ 
+*/ 
+#define SYMBIAN_MBUF_POOL_SIZE                             0 
  
 /** #SYMBIAN_MULTIMEDIA_A3FDEVSOUND  
 This definition is used in symbian A3F build files.
@@ -442,7 +545,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               0 
  
 /** #SYMBIAN_ODP_NUMBER_OF_MIN_LIVE_PAGES  
 Defines the minimum number of 4k live pages available in the system for code
@@ -463,14 +566,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 +585,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. 
@@ -507,7 +610,7 @@
 /** #__AAC  
 Device supports Advanced Audio Coding (AAC) codec. 
 */ 
-#undef __AAC                                               
+#define __AAC                                               
  
 /** #__ACCESSORY_FW  
 Accessory framework is a Series 60 subsystem that enables adding various
@@ -540,12 +643,12 @@
 /** #__AMR_NB  
 Device supports Adaptive Multi-Rate (AMR) narrowband codec. 
 */ 
-#undef __AMR_NB                                            
+#define __AMR_NB                                            
  
 /** #__AMR_WB  
 Device supports Adaptive Multi-Rate (AMR) wideband codec. 
 */ 
-#undef __AMR_WB                                            
+#define __AMR_WB                                            
  
 /** #__APPLICATION_CONTROLLABLE_AUDIO_ROUTING  
 "An application UI can control audio routing in addition to adaption layer. If 
@@ -895,6 +998,15 @@
 */ 
 #define __EMAIL_UI                                          
  
+/** #__ENABLE_BACKSTEPPING  
+A flag that defines whether Backstepping -service is in use in Music Player.
+With Backstepping, MusicSuite and Music Widget interaction with music player is
+much more fluent. Back takes back to Music Suite, instead of Music Player
+library view. This flag will enable compilation of mpxbacksteppingutility, which
+music player uses to implement Backstepping. Synergy Change: ou1cimx1#122317 
+*/ 
+#undef __ENABLE_BACKSTEPPING                               
+ 
 /** #__EN_POLICY_DOS  
 "ENPolicy provides emergency number policy APIs and is used by phoneserver
 component.DOS emergency number policy checks emergency number by using ETel
@@ -1346,7 +1458,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 +1793,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                                
  
@@ -1821,7 +1933,7 @@
 subscriber is able to see A subscriber's number and name even the caller's ID is
 not stored in the phone. The name of the subscriber comes from network. 
 */ 
-#undef __SERIES60_PHONE_CNAP                               
+#define __SERIES60_PHONE_CNAP                               
  
 /** #__SERIES60_PHONE_NUMBER_GROUPING  
 Deprecated flag. Included for compatibility reasons. Value must equal to
@@ -2090,7 +2202,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 +2242,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,7 +2298,7 @@
 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
@@ -2208,4 +2320,4 @@
 #define __XSP_EXTENSION_MANAGER                             
  
 
-#endif // __BLDPRIVATE_HRH 
\ No newline at end of file
+#endif // __BLDPRIVATE_HRH
--- a/sf_config/config/inc/bldpublic.hrh	Tue May 11 17:20:40 2010 +0300
+++ b/sf_config/config/inc/bldpublic.hrh	Tue May 18 17:16:07 2010 +0100
@@ -15,12 +15,16 @@
 *
 */
 
+
 #ifndef __BLDPUBLIC_HRH
 #define __BLDPUBLIC_HRH
 
-//Defining only language 01 for SF build purposes
-#define LANGUAGE_IDS LANG sc 01  
-
+#define LANGUAGE_IDS LANG sc 37 102 42 44 45 25 07 18 01 10 129 158 160 159 157 161 49 50 09 02 51 103 03 54 57 30 17 15 59 327 05 32 65 67 68 70 326 08 27 13 76 31 78 16 79 26 28 04 83 06 39 29 33 14 93 94 96 
+
+/** #Camera 
+Container for camera specific features
+*/
+#undef Camera                                             
 
 /** #FF_3D_RINGING_TONES 
 Device supports 3D ringing tones.
@@ -32,6 +36,15 @@
 */
 #undef FF_3G_CELLBROADCAST                                
 
+/** #FF_ABC_AGRESSIVE_UI 
+Display driver will provide an interface for switching Automatic Brightness
+Control (ABC). More agressive Automatic Display Control (ABC) UI for display
+driver will be in Settings display plug in, and as configurable for products,
+but not neccessarily available for user. The agressive UI for ABC is
+enabled/disabled by the feature flag.  
+*/
+#undef FF_ABC_AGRESSIVE_UI                                
+
 /** #FF_ADAPTIVE_WLAN_SCANNING_SUPPORT 
 Adaptive WLAN Scanning (AWS) is a component that tells WLAN engine how often to
 perform WLAN background scanning. AWS listens and receives events from other
@@ -40,16 +53,41 @@
 */
 #undef FF_ADAPTIVE_WLAN_SCANNING_SUPPORT                  
 
+/** #FF_ADDITIONAL_FONTS 
+This flag is to enable new font supports namely equivalents of Arial, Times New
+Roman, Courier for content viewing mainly to be used in browser. If this flag is
+not enabled it means it will continue to have only current fonts and no
+additional font support.
+*/
+#define FF_ADDITIONAL_FONTS                                
+
 /** #FF_AI_WLANSNIFFER_WIDGET 
 Flag for WLANSniffer Homescreen widget.
 */
 #undef FF_AI_WLANSNIFFER_WIDGET                           
 
+/** #FF_ALTERNATIVE_CALL_WAITING_TONE 
+When this flag is enabled an alternative call waiting tone will be used
+*/
+#undef FF_ALTERNATIVE_CALL_WAITING_TONE                   
+
+/** #FF_ARABIC_HANDWRITING_RECOGNITION_INPUT 
+This flag is used to enable arabic finger handwriting input in capacitive touch
+screen phone.
+*/
+#undef FF_ARABIC_HANDWRITING_RECOGNITION_INPUT            
+
 /** #FF_ASYNCH_FILE_SAVE_QUEUE 
 Camcorder requires support from the Asynchronous File Save Queue.
 */
 #define FF_ASYNCH_FILE_SAVE_QUEUE                          
 
+/** #FF_AT_COMMANDS_TEST_AUTOMATION 
+Using FF_AT_COMMANDS_TEST_AUTOMATION will either include or exclude
+atcmdplugin.dll from ROM
+*/
+#undef FF_AT_COMMANDS_TEST_AUTOMATION                     
+
 /** #FF_AUDIO_MESSAGING_INCLUDE_IN_ROM 
 This flags controls whether the Audio Messaing ROM files are included in the
 build.
@@ -62,16 +100,21 @@
 */
 #undef FF_AUDT                                            
 
+/** #FF_AUTOMOTIVESTACK 
+S60_PUBLIC Feature Flag for In-Car Optimized device EPIC
+*/
+#undef FF_AUTOMOTIVESTACK                                 
+
 /** #FF_AUTO_REDIAL_FOR_VIDEO_CALL 
-"This flag indicates redial sequence, when video call is not succeeded for
-certain reasons."
+This flag indicates redial sequence, when video call is not succeeded for
+certain reasons.
 */
 #define FF_AUTO_REDIAL_FOR_VIDEO_CALL                      
 
 /** #FF_AVKON_EMOTION_ICON_ENABLED 
 to enable/disable the emotion icon support in avkon editor control
 */
-#undef FF_AVKON_EMOTION_ICON_ENABLED                      
+#define FF_AVKON_EMOTION_ICON_ENABLED                      
 
 /** #FF_BIRTHDAY_IMPROVEMENT 
 This feature flag is required for the enabling/disabling customized birthday &
@@ -80,26 +123,70 @@
 
 The requirement is 
 
-B’day & Anniversary Notification for MyFaves contact
-
-•	Picture of the MyFaves contact in the popup which can be masked as circular
-
-•	Currently Birthday notification is same as any other Calendar alarm
+B’day & Anniversary Notification for MyFaves contact
+
+•	Picture of the MyFaves contact in the popup which can be masked as circular
+
+•	Currently Birthday notification is same as any other Calendar alarm
 
 */
 #undef FF_BIRTHDAY_IMPROVEMENT                            
 
+/** #FF_BLUETOOTH_DATA_PROFILES_DISABLED 
+This flag is used to turn off bluetooth data profiles, and is to be used as part
+of Enterprise Disabling of Bluetooth, allowing the device to use bluetooh for
+hands free purposes only
+*/
+#undef FF_BLUETOOTH_DATA_PROFILES_DISABLED                
+
+/** #FF_BLUETOOTH_DISABLED 
+Flag used to disable all Bluetooth functionality in the device.  This will be
+used for Enterprise Disabling of Bluetooth.  
+
+This flag is required to be used instead of the __BT flag so that the Bluetooth
+UI is still present after Bluetooth has been disabled, allowing the user to be
+notified of why they cannot use it if they attempt to
+*/
+#undef FF_BLUETOOTH_DISABLED                              
+
 /** #FF_BROWSER_PROGRESSIVE_DOWNLOAD 
 This feature flag is needed to enable/disable the progressiveness of the
 downloads in download manager server and its clients.
 */
 #define FF_BROWSER_PROGRESSIVE_DOWNLOAD                    
 
+/** #FF_CALENDAR_DAY_VIEW 
+This flag is needed for run time configuration of Business calendar day view.
+The day view will be loaded as a plug-in based on this flag being enabled. Day
+view will be integrated along with other native views(month, week, agenda &
+Todo).
+*/
+#undef FF_CALENDAR_DAY_VIEW                               
+
+/** #FF_CALENDAR_SCROLLABLE_PREVIEW 
+This flag is needed for run time configuration of scrollable preview pane in
+calendar. The scrollable preview pane will be loaded as a plug-in with calendar
+month view and week view based on this flag being enabled. Layouts with
+scrollable preview pane will be loaded on run time based on this flag being
+enabled for month / week view
+*/
+#undef FF_CALENDAR_SCROLLABLE_PREVIEW                     
+
+/** #FF_CAL_MEETING_REQUEST_UI 
+With this flag it is selected if Meeting Request UI included with flag
+FF_MEETING_REQUEST_UI is available on Calendar side or not. If flag is not
+defined MRUI is available only when MR Emails are opened from Email application.
+If flag is defined then meeting requests can be opened also from Calendar
+application and Calendar application will offer possibility to create new
+meeting requests.
+*/
+#undef FF_CAL_MEETING_REQUEST_UI                          
+
 /** #FF_CAPACITIVE_DISPLAY 
 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
@@ -120,6 +207,11 @@
 */
 #undef FF_CHINESE_FONTS_HIRES                             
 
+/** #FF_CHINESE_SELECTION_KEY 
+Device uses this flag to differentiate if selection key existed
+*/
+#undef FF_CHINESE_SELECTION_KEY                           
+
 /** #FF_CLOCK_MULTIPROCOL_SUPPORT 
 This flag shall be used to determine if product programs need clock's
 multiprotocol support, i.e. getting time information from different time source
@@ -129,6 +221,11 @@
 */
 #undef FF_CLOCK_MULTIPROCOL_SUPPORT                       
 
+/** #FF_CMAIL_INTEGRATION 
+5250+ specific features in Cmail are variated with this flag.
+*/
+#undef FF_CMAIL_INTEGRATION                               
+
 /** #FF_COMMSDAT_CREATION_FROM_XML 
 There will be a new component in S60 called CommsDatCreator (CDC) that will
 initialize CommsDat using an input XML file which is generated by the
@@ -158,6 +255,12 @@
 */
 #define FF_CONNECTION_OVERRIDE                             
 
+/** #FF_CONTACTS_COMPANY_NAMES 
+When enabled, contacts’ company names are shown after first+last name in
+Phonebook Names list.
+*/
+#undef FF_CONTACTS_COMPANY_NAMES                          
+
 /** #FF_CONTACTS_GROUP_FUNCTIONALITY 
 We need a feature flag for ROM Creation time variation. The Phonebook2
 application is constructed on a plugin based architecture. This design allows
@@ -168,7 +271,21 @@
 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_MERGE 
+If enabled, then phonebook UI contains the command for Merge.
+*/
+#define FF_CONTACTS_MERGE                                  
+
+/** #FF_CONTACTS_MYCARD 
+This feature flag controls whether phonebook application supports MyCard.
+If flag is enabled:
+- Phonebook has MyCard item at top of names list
+- The user can open MyCard view from phonebook
+- Other applications can launch the MyCard view 
+*/
+#define FF_CONTACTS_MYCARD                                 
 
 /** #FF_CONTACTS_NICKNAME 
 The nickname functionality needs a feature flag for the following reasons:
@@ -198,6 +315,50 @@
 */
 #undef FF_CONTACTS_NICKNAME                               
 
+/** #FF_CONTACTS_PREDICTIVE_SEARCH 
+When enabled, User can turn on/off Phonebook’s predictive search functionality,
+using an item in Names list’s Option-menu.
+*/
+#undef FF_CONTACTS_PREDICTIVE_SEARCH                      
+
+/** #FF_CONTACTS_REMOTE_LOOKUP 
+When enabled, and a remote search service is installed in device, item “Search
+remotely” is shown in Phonebook Names list.
+*/
+#define FF_CONTACTS_REMOTE_LOOKUP                          
+
+/** #FF_CONTACTS_SOCIAL 
+When flag is enabled, phonebook application has the following features:
+- Names list shows social status texts
+- Contact Card shows social status text & allows jumping to external social
+application.
+- MyCard shows social status text & allows jumping to external social
+application.
+- MyCard has button(s) that show(s) presence & allow jumping to external IM
+application.
+
+*/
+#define FF_CONTACTS_SOCIAL                                 
+
+/** #FF_CONTACT_WIDGET 
+	Defines if Friends widget exists or not
+*/
+#undef FF_CONTACT_WIDGET                                  
+
+/** #FF_CONTEXT_FRAMEWORK_V2 
+This flag enables Context Framework version 2.
+*/
+#undef FF_CONTEXT_FRAMEWORK_V2                            
+
+/** #FF_CONTEXT_PROFILES 
+Context profiles enable the device to automatically adapt in users every day
+life and combine current Profiles functionality with concepted and studied
+Situations functionality. If the flag sets to true, context profiles are
+enabled. If flase, otherwises.
+
+*/
+#undef FF_CONTEXT_PROFILES                                
+
 /** #FF_CUSTOMER_HELPS_IN_USE 
 Customer helps are included into image based on this flag.
 */
@@ -211,11 +372,46 @@
 */
 #define FF_DEVICE_DIAGNOSTICS_APP                          
 
+/** #FF_DEVICE_ENCRYPTION_FEATURE 
+This flag is required for Device Encryption feature which goes to Symbian
+Foundation. The existing flag (FF_NATIVE_FILE_ENCRYPTION) will exclusively be
+used by NFE, which doesn't go to SF. Hence a different flag is required for all
+those middleware and application layer components of DE.
+*/
+#define FF_DEVICE_ENCRYPTION_FEATURE                       
+
+/** #FF_DISABLE_OMA_SUPL_V2 
+When this flag is ON SUPL v2.0 is NOT supported. Note that this flag is a
+negative flag in order to minimize the risk for the master code line.
+*/
+#undef FF_DISABLE_OMA_SUPL_V2                             
+
+/** #FF_DM_BROWSER_ADAPTER 
+Browser adaper is used by Device Management to Set/Get the browser settings from
+the operator server. This feature is requested by CMCC. The feature flag is used
+to differentiate between Nokia Specific implemenation and OMA DM implementation.
+*/
+#define FF_DM_BROWSER_ADAPTER                              
+
+/** #FF_DM_CONNMO_ADAPTER 
+OMA Device Management Connectivity Managment Object (ConnMO) provides management
+of connectivity settings. This flag will help in enabling ConnMO plugin.
+*/
+#undef FF_DM_CONNMO_ADAPTER                               
+
 /** #FF_DM_INSTALL_SECURITY 
 OMA DM SW installer implementation included in build.
 */
 #undef FF_DM_INSTALL_SECURITY                             
 
+/** #FF_DM_STREAMING_ADAPTER 
+Streaming adapter is used by Device Mangement to Set/Get the streaming settings
+from the operator server. CMCC has requested support for this new adapter. This
+feature flag is used to differentiate the Nokia specfic implementation and OMA
+DM implementation.
+*/
+#define FF_DM_STREAMING_ADAPTER                            
+
 /** #FF_DUAL_LANGUAGE_SUPPORT 
 This Flag is used to develop support for dual language feature. This is an
 enhancement to the basic prediction feature where words predicted will come from
@@ -223,6 +419,11 @@
 */
 #undef FF_DUAL_LANGUAGE_SUPPORT                           
 
+/** #FF_DUAL_MODEM 
+Flag for developing Dual Modem feature
+*/
+#undef FF_DUAL_MODEM                                      
+
 /** #FF_EMAIL_FRAMEWORK 
 Defines whether the product includes the email multiprotocol framework. When the
 flag is defined all parts constituting new email solution are in ROM:
@@ -232,6 +433,11 @@
 */
 #define FF_EMAIL_FRAMEWORK                                 
 
+/** #FF_EMAIL_FULLSCREENVIEWER 
+This flag enables full screen mode in email viewer
+*/
+#undef FF_EMAIL_FULLSCREENVIEWER                          
+
 /** #FF_EMAIL_IPS_SERVICES 
 Defines whether the product includes IMAP4, POP3 and SMTP protocol support.
 */
@@ -247,6 +453,11 @@
 */
 #define FF_EMAIL_MCE_INTEGRATION                           
 
+/** #FF_EMAIL_PREDICTIVESEARCH 
+This flag enables predictive address search in email editor
+*/
+#undef FF_EMAIL_PREDICTIVESEARCH                          
+
 /** #FF_EMAIL_PROTOCOL_PLUGINS 
 When defined, default email protocol plugins are enabled.
 */
@@ -257,6 +468,12 @@
 */
 #undef FF_EMAIL_UI                                        
 
+/** #FF_EMAIL_UI_SPLITSCREEN 
+This feature enables split screen usage in email editors instead of touch input
+window
+*/
+#undef FF_EMAIL_UI_SPLITSCREEN                            
+
 /** #FF_EMPTY_COMMSDAT 
 The override flags FF_EMPTY_COMMSDAT, FF_VANILLA_COMMSDAT and FF_RND_COMMSDAT
 determine which default CommsDat will be put to the image independent of image
@@ -284,6 +501,21 @@
 */
 #undef FF_EMPTY_COMMSDAT                                  
 
+/** #FF_ENABLE_ISI_COMMUNICATION_IN_USB_CHARGING_MODE 
+Feature info adaptation will read the PP-bit value from ISA info server and map
+the value of PP bit into KFeatureIdCertTesting. SSM then will read
+KFeatureIdCertificationTesting and if system is in USB charging mode , then
+start USB components into the mode where ISI communication is possible.
+*/
+#define FF_ENABLE_ISI_COMMUNICATION_IN_USB_CHARGING_MODE   
+
+/** #FF_ENHANCED_CALENDAR_EVENT_UI 
+This flag controls inclusion of enhanced Calendar Event Viewers and Editors that
+replace standard ones and provide consistent look and feel with Meeting Request
+UI included with flag FF_MEETING_REQUEST_UI.
+*/
+#undef FF_ENHANCED_CALENDAR_EVENT_UI                      
+
 /** #FF_FARSI_CALENDAR 
 S60 calendar should provide possibility to integrate Farsi calendar application
 to S60 calendar.
@@ -311,11 +543,38 @@
 */
 #define FF_FMTX                                            
 
+/** #FF_FMTX_RDS_TEXT 
+Flag to enable RDS text transmission through FM transmitter (FMTX). Runtime
+variation needed in SysAp. FMTX UI SW uses this flag in .iby files so it is not
+runtime variated in UI SW.
+
+RDS text transmission not enabled currently (ELZG-7PE3G9) 
+*/
+#undef FF_FMTX_RDS_TEXT                                   
+
+/** #FF_FOTA_CHECK_LIMITATION 
+When this flag is enabled user can only check for FOTA updates from the server
+once in defined time period. The time period is defined by a cenrep value -
+default value is 24h.
+*/
+#undef FF_FOTA_CHECK_LIMITATION                           
+
 /** #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_ACCESS_NETWORK 
+Generic Access Network (GAN), previously known as Unlicensed Mobile Access (UMA)
+technology provides access to GSM/3G and GPRS mobile services over unlicensed
+spectrum technologies. By deploying GAN technology, service providers can enable
+subscribers to roam and handover between cellular networks and public and
+private unlicensed wireless networks using dual-mode mobile handsets. However
+GAN needed some platform changes to be fully functional and those changes must
+be run time variable.
+*/
+#undef FF_GENERIC_ACCESS_NETWORK                          
 
 /** #FF_GENERIC_FONTS_ASSETS 
 This flag is used to check if generic font assets are to be used, this is used
@@ -439,6 +698,17 @@
 */
 #define FF_IMAGEPRINT_UPNP_PROTOCOL                        
 
+/** #FF_IMAGE_EDITOR 
+Feature flag for Image Editor support in the platform. Applications could check
+for this feature support and make use of it.
+Note: In Symbian Foundation context, Image Editor is not available in Sym ^3,
+hence there is a need to have feature flag in public domain. Other vendors can
+bring in their own implementation of the editor and make use of this flag to
+pulish the feature support.
+
+*/
+#undef FF_IMAGE_EDITOR                                    
+
 /** #FF_INCLUDE_CHINESE_DICTIONARY 
 This feature flag  controls the inclusion/exclusion of chinese dictionary in
 chinese variants. The flag is used in dictionary_variant.iby
@@ -461,23 +731,60 @@
 */
 #undef FF_INTELLIGENT_TEXT_INPUT                          
 
+/** #FF_IPSEC_UMA_SUPPORT_ENABLE 
+The default behaviour in IPSec policy conflict resolution logic is to put “Drop”
+mode over the “bypass” mode. Hence the resulting action is to drop the IP
+packets with the merged policies. 
+According to the default behaviour UMA is always with “bypass” property and
+whenever mVPN with drop mode connection rove-in or rove out from GAN (UMAN)
+results in a selector conflict. 
+
+With the macro enabled IPSec handles UMA conflict gracefully allowing UMA to
+work.
+*/
+#undef FF_IPSEC_UMA_SUPPORT_ENABLE                        
+
+/** #FF_ITI_VIRTUAL_TOUCH_FIRST_GENERATION_SUPPORT 
+ITI feature (2nd generation text input features) are enabled in 5.0 & 9.1 TBD,
+i.e MCL, but these features are not supported in touch input modes like Virtual
+ITU-T, VKB & FSQ. Hence, to support 1st generation features to touch input
+methods, this flag is required.
+
+*/
+#undef FF_ITI_VIRTUAL_TOUCH_FIRST_GENERATION_SUPPORT      
+
 /** #FF_JAVA_GLOBAL_INDICATORS_API 
 Enables Java Global Indicator API. Global Indicator API can be used to add
 indicators to phone status pane.
 */
 #undef FF_JAVA_GLOBAL_INDICATORS_API                      
 
+/** #FF_KEYPAD_NO_SEND_KEY 
+Device does not have a send key to activate phone call.
+*/
+#undef FF_KEYPAD_NO_SEND_KEY                              
+
 /** #FF_LAYOUT_360_640_NONTOUCH 
 New non touch NHD (=QHD) resolution. Flag determine which layout dlls are put to
 hw image. 
 */
 #undef FF_LAYOUT_360_640_NONTOUCH                         
 
+/** #FF_LAYOUT_360_640_TOUCH_NHD4 
+layout for nhd4
+*/
+#undef FF_LAYOUT_360_640_TOUCH_NHD4                       
+
 /** #FF_LAYOUT_360_640_TOUCH_QHD2 
 Layout data for QHD2_TOUCH resolution.
 */
 #undef FF_LAYOUT_360_640_TOUCH_QHD2                       
 
+/** #FF_LAYOUT_480_640_TOUCH_VGA4 
+layout for vga4
+*/
+#undef FF_LAYOUT_480_640_TOUCH_VGA4                       
+
 /** #FF_LAYOUT_480_640_VGA3 
 Layout data for VGA3 resolution.
 */
@@ -490,11 +797,21 @@
 */
 #undef FF_LAYOUT_640_360_NONTOUCH                         
 
+/** #FF_LAYOUT_640_360_TOUCH_NHD4 
+layout for nhd4
+*/
+#undef FF_LAYOUT_640_360_TOUCH_NHD4                       
+
 /** #FF_LAYOUT_640_360_TOUCH_QHD2 
 Layout data for QHD2 TOUCH resolution.
 */
 #undef FF_LAYOUT_640_360_TOUCH_QHD2                       
 
+/** #FF_LAYOUT_640_480_TOUCH_VGA4 
+layout for vga4 landscape
+*/
+#undef FF_LAYOUT_640_480_TOUCH_VGA4                       
+
 /** #FF_LAYOUT_640_480_VGA3 
 Layout data for VGA3 resolution.
 */
@@ -503,7 +820,7 @@
 /** #FF_LBT_ENGINE 
 To enable/disable LBT engine from S60. By default this should be ON
 The Location Triggering subsystem provides a service to applications for
-notifications based on the user’s location. Applications can create and remove
+notifications based on the user’s location. Applications can create and remove
 location based triggers, and applications can be notified or started when one of
 their triggers is fired, i.e. the triggering conditions are met
 Feature wiki : https://s60wiki.nokia.com/S60Wiki/Location_based_triggering
@@ -531,6 +848,12 @@
 */
 #define FF_LBT_MGTUI                                       
 
+/** #FF_LIMITED_MESSAGE_AND_ALARM_TONE_SIZE 
+When this flag is on the message alert tones and alarm (calendar, clock) tones
+maximum size is defined by cenrep key KProEngRingingToneMaxSize
+*/
+#undef FF_LIMITED_MESSAGE_AND_ALARM_TONE_SIZE             
+
 /** #FF_LINKED_FONTS_CHINESE 
 For enabling linked font in Chinese a new feature flag FF_LINKED_FONTS_CHINESE
 is needed.
@@ -541,11 +864,33 @@
 */
 #undef FF_LINKED_FONTS_CHINESE                            
 
+/** #FF_LIVETV 
+support for DVBH live tv 1.1 (using bluetooth accessory SU-33W)
+*/
+#undef FF_LIVETV                                          
+
+/** #FF_LOCATION_MW_APE_CENTRIC_ARCH_SUPPORT 
+S60 Location FW and its related components are going to change to support APE
+Centric architecture. In order to toggle architecture support between new and
+old,we have introduced this flag. If this flag is ON, then new architecture will
+get into use. If its OFF then old architecure will get into use.
+*/
+#undef FF_LOCATION_MW_APE_CENTRIC_ARCH_SUPPORT            
+
 /** #FF_MDS_CAMERA_SUPPORT 
 Enables camera application support for Metadata system.
 */
 #define FF_MDS_CAMERA_SUPPORT                              
 
+/** #FF_MECO_XMPP 
+XMPP is an Instant Messaging Protocol. MECO (MEssaging COnvergence)
+implementation of XMPP is disabled by the use of this flag. This is to be used
+for run-time purposes. If this flag is false, then the functionality covered by
+this flag cannot be used although the library itself exists.
+
+*/
+#undef FF_MECO_XMPP                                       
+
 /** #FF_MEETING_REQUEST_UI 
 Meeting request UI from Custom SW will be is part of Common Email. This new flag
 replaces Custom SW specific flag FF_ES_MEETING_REQUEST_UI used in Freestyle. MR
@@ -553,7 +898,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
@@ -570,6 +915,21 @@
 */
 #undef FF_MMS_POSTCARD_INCLUDE_IN_ROM                     
 
+/** #FF_MPX_VIDEO_PLAYER 
+When this flag is on, MPX framework in platform supports video playback and
+mpxvideoplayer.exe is included in ROM. Platform's default video player is
+mpxvideoplayer.exe. This flag can be used at build time, if necessary, to decide
+if code can be build against services provided by MPX video player instead of
+libraries provided by Media Player and Video Center, which both are replaced by
+MPX Video Player.
+*/
+#define FF_MPX_VIDEO_PLAYER                                
+
+/** #FF_MTP_CONTROLLER 
+The feature enables device to support MTP Controller service
+*/
+#define FF_MTP_CONTROLLER                                  
+
 /** #FF_NCD_ENGINE 
 This flag enables building the NCD Engine to S60 release.
 */
@@ -627,18 +987,35 @@
 */
 #undef FF_OFN_FEATURE                                     
 
+/** #FF_OMADRM1_FULL_SUPPORT 
+This boolean feature flag indicates if OMA DRM v1 is fully (including combined
+delivery and separate delivery) supported or not. 
+*/
+#undef FF_OMADRM1_FULL_SUPPORT                            
+
+/** #FF_OMADRM2_SUPPORT 
+This boolean feature flag indicates if OMA DRM v2 is supported or not. 
+*/
+#undef FF_OMADRM2_SUPPORT                                 
+
 /** #FF_OMA_SCOMO_ADAPTER 
 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
 ROM image.
 
 */
-#undef FF_OOM_MONITOR2_COMPONENT                          
+#define FF_OOM_MONITOR2_COMPONENT                          
+
+/** #FF_OPENMAX_AL 
+OpenMax AL is a Khronos API (http://www.khronos.org) included as a platform API
+to support QtMobility multimedia.
+*/
+#undef FF_OPENMAX_AL                                      
 
 /** #FF_OSS_LEGAL_NOTICE 
 This feature adds OSS legal notice to About application. The notice is needed if
@@ -656,7 +1033,7 @@
 /** #FF_PLATFORM_SIMULATOR 
 Platform Simulator product makes it possible to execute software on simulated
 target hardware using a Windows or Linux workstation. Platform Simulator is
-based on ARM® RealView® tools that support modeling terminal hardware using LISA
+based on ARM® RealView® tools that support modeling terminal hardware using LISA
 language. Platform Simulator runs any OS e.g. S60 or Linux. The OS is introduced
 to the simulator as a core image loaded into the simulated flash memory. 
 
@@ -678,12 +1055,18 @@
 */
 #undef FF_PLATFORM_SIMULATOR                              
 
+/** #FF_PLAYREADY_SUPPORT 
+This boolean feature flag indicates if PlayReady technology is supported or not.
+
+*/
+#undef FF_PLAYREADY_SUPPORT                               
+
 /** #FF_PNPMS_PROV_FILTER 
 On enabling this feature flag pnpprovfilter.dll will be created and this feature
 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 +1076,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
@@ -717,11 +1100,26 @@
 */
 #undef FF_PROV_AUTHTYPE_PLUGIN                            
 
+/** #FF_QT 
+Generic feature flag for for QT based features (to be used in image creation and
+run-time variation)
+*/
+#undef FF_QT                                              
+
 /** #FF_QWERTY_FN_KEY 
 The device has a Fn key
 */
 #undef FF_QWERTY_FN_KEY                                   
 
+/** #FF_RFSUICON_ERASE_ALL_DATA 
+This feature flag is required to either enable or disable the display of “Erase
+all data” icon (deep RFS) in S60 UI menu. Using this feature flag the
+functioanlity can either be totally enabled or disabled. Not all devices may
+require this feature and hence it needs to be configurable.
+
+*/
+#undef FF_RFSUICON_ERASE_ALL_DATA                         
+
 /** #FF_RND_COMMSDAT 
 The override flags FF_EMPTY_COMMSDAT, FF_VANILLA_COMMSDAT and FF_RND_COMMSDAT
 determine which default CommsDat will be put to the image independent of image
@@ -753,7 +1151,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,7 +1162,7 @@
 /** #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.
@@ -802,19 +1200,67 @@
 */
 #undef FF_SHOW_MMPLAYER                                   
 
+/** #FF_SIDESLIDER_SUPPORT 
+To make the side slier support available at platform build which is currently
+not. System application requires this flag
+*/
+#undef FF_SIDESLIDER_SUPPORT                              
+
+/** #FF_SIM_CONSECUTIVE_6F00_ERRORS_HANDLING 
+When this flag is enabled UI error note will shonwn in case of consecutive 6F 00
+errors from UICC (SIM card)
+*/
+#undef FF_SIM_CONSECUTIVE_6F00_ERRORS_HANDLING            
+
+/** #FF_SIP_APN_SWITCHING 
+Provides a mechanism to manipulate APN name of a IAP based SIP registration
+status
+*/
+#undef FF_SIP_APN_SWITCHING                               
+
+/** #FF_SIP_CUSTOM_PDP_HANDLING 
+Controls the handling of PDP activation failures in operator specified method
+*/
+#undef FF_SIP_CUSTOM_PDP_HANDLING                         
+
+/** #FF_SMALL_SCREEN_TOUCH 
+for small physical screen but big resolution and touch(for example 2.4" vga
+touch)
+*/
+#undef FF_SMALL_SCREEN_TOUCH                              
+
 /** #FF_STARTUP_OMA_DM_SUPPORT 
 The flag will be used to enable receiving OMA CP/DM messages during system
 start-up in those devices that need the feature.
 */
 #undef FF_STARTUP_OMA_DM_SUPPORT                          
 
+/** #FF_STROKE_INPUTMODE_IN_TAIWAN 
+The flag to switch stroke input mode in taiwan language. This flag is introduced
+from 9.2
+*/
+#undef FF_STROKE_INPUTMODE_IN_TAIWAN                      
+
+/** #FF_SUPL_IMSI_GENERATED_SERVER_PRIORITY_DEFAULT 
+When this flag is enabled IMSI based autogenerated SUPL server has higher
+priority on the SUPL server list than the hard coded servers from startup
+settings DB
+*/
+#undef FF_SUPL_IMSI_GENERATED_SERVER_PRIORITY_DEFAULT     
+
+/** #FF_SYNCML_STATUS_EXTENDED_ERROR_CODES 
+When this flag is ON it is possible to write extended syncml error codes to sync
+log
+*/
+#undef FF_SYNCML_STATUS_EXTENDED_ERROR_CODES              
+
 /** #FF_TACTICONS 
 Tacticons are haptic effects that can be played by the applications to indicate
 success or failure of actions. Tacticons can be also automatically played
 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 +1273,13 @@
 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_TARM_CAPABILITY_CHECKING 
+This is a feature flag to decide the code flow base on either the Application
+capability check or the SID check in case of third party applications
+*/
+#undef FF_TARM_CAPABILITY_CHECKING                        
 
 /** #FF_TCP_MYFAVES_FEATURE 
 The feature flag is to turn ON/OFF MyFaves feature in a S60 3.2 complementary
@@ -842,6 +1294,57 @@
 */
 #undef FF_TCP_MYPROFILE                                   
 
+/** #FF_TD_CLMContactReplicationFromPhonebookToUSIMCard 
+Support for CMCC standard USIM contact format. 
+
+*/
+#undef FF_TD_CLMContactReplicationFromPhonebookToUSIMCard 
+
+/** #FF_TD_CMCCATCommandsSupport 
+When enabled, this flag will extend the set of supported AT commands
+• AT+CMGD (Delete message)
+• AT+CMGW (Write message to memory)
+• AT^HVER (Hardware version) 
+• AT^SYSINFO (System information query)
+• AT^DSCI (Call state indication)
+• AT^DMUX (Multiplexing)
+• AT^DDSETEX (Data card voice channel configuration)
+
+*/
+#undef FF_TD_CMCCATCommandsSupport                        
+
+/** #FF_TD_CMCCPIMPromptServerFullWhenReceive420StatusCodeFromServer 
+When this flag is enabled, the device will give appropriate UI prompt to the
+user, if status code 420 is received during data synchronization.
+
+*/
+#undef FF_TD_CMCCPIMPromptServerFullWhenReceive420StatusCodeFromServer 
+
+/** #FF_TD_CMCCPIMSynchronizationProgressIndicatorUI  
+This flag enables an enhanced progress status UI. Instead of standard progress
+bar or percentage information, the UI will show following information:
+x/y for uplink (x = current item, y = total items) and z for downlink (z =
+current item).
+
+*/
+#undef FF_TD_CMCCPIMSynchronizationProgressIndicatorUI    
+
+/** #FF_TD_SCDMA 
+This is a feature flag used to turn on/off TD-SCDMA releated features
+*/
+#undef FF_TD_SCDMA                                        
+
+/** #FF_TD_SCDMA_FORBIDDENOPERATORICONDISPLAY 
+This feature is used enable Forbidden operator icon display feature.
+
+*/
+#undef FF_TD_SCDMA_FORBIDDENOPERATORICONDISPLAY           
+
+/** #FF_TD_SCDMA_VIDEOCALL_KEY 
+This FF is used to enable video call key feature for TD-SCDMA product
+*/
+#undef FF_TD_SCDMA_VIDEOCALL_KEY                          
+
 /** #FF_THEME_HAZE 
 Haze theme is included in ROM image.
 
@@ -885,6 +1388,20 @@
 */
 #undef FF_USB_HOST                                        
 
+/** #FF_USB_MODEM 
+FF_USB_MODEM will be used to en/disable PAM(Phone As Modem) feature. When flag
+is enabled, the feature is included in image.
+
+KFeatureIdUsbModem is used for runtime variant.
+
+*/
+#undef FF_USB_MODEM                                       
+
+/** #FF_USE_DEFAULT_KEYMAP 
+Default Keymappings are included into image based on this flag
+*/
+#undef FF_USE_DEFAULT_KEYMAP                              
+
 /** #FF_USE_EGPRS_ICON 
 The flag is used to enable EGPRS icon in the status pane. If the flag is
 disabled, GPRS icon must be shown instead of EGPRS icon.
@@ -900,7 +1417,15 @@
 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_NAVIKEY_FOR_VOLUME 
+This feature flag is used to enable/disable the use of the navikey for volume
+adjustment. In products with no dedicated side volume key, this flag can be
+enabled. When the flag is enabled, the "up" navikey is used to increment volume
+by one step, and the "down" navikey is used to decrement volume by one step. 
+*/
+#undef FF_USE_NAVIKEY_FOR_VOLUME                          
 
 /** #FF_USE_ZI_ENGINE 
 On enabling this feature flag eZitext engine will be part of the Image and
@@ -935,6 +1460,23 @@
 */
 #undef FF_VANILLA_COMMSDAT                                
 
+/** #FF_VIDEO_AUDIO_BRANDING 
+When this flag is set on, videoplayer UI supports audio track type based
+branding elements.
+*/
+#undef FF_VIDEO_AUDIO_BRANDING                            
+
+/** #FF_VIDEO_EDITOR 
+Feature flag for Video Editor support in the platform. Applications could check
+for this feature support and make use of it.
+Note: In Symbian Foundation context, Video Editor is not available in Sym ^3,
+hence there is a need to have feature flag in public domain. Other vendors can
+bring in their own implementation of the editor and make use of this flag to
+pulish the feature support.
+
+*/
+#undef FF_VIDEO_EDITOR                                    
+
 /** #FF_VIRTUAL_FULLSCR_QWERTY_INPUT 
 Indicates whether a device needs Virtual full-screen qwerty input or not.
 
@@ -975,17 +1517,13 @@
 */
 #undef FF_WEBVIDEO_PH2                                    
 
-/** #FF_WLANSNIFFER 
-The purpose of the flag is to control whether the WlanSniffer2 application is to
-be integrated into 3.2 product builds or not.
-*/
-#undef FF_WLANSNIFFER                                     
-
-/** #FF_WLANSNIFFER_VOIP_ENHANCEMENTS 
-The WLAN Sniffer VoIP enhancements will provide easy way to connect to VoIP
-service via Sniffer's Active Idle plugin.
-*/
-#undef FF_WLANSNIFFER_VOIP_ENHANCEMENTS                   
+/** #FF_WLAN_AUTHENTICATION_ONLY_SUPPORT 
+When defined, the flag enables support for WLAN connections that are
+authenticated but the agreed keys are not used for data frame protection. That
+is, data is transferred in plaintext and with no cryptographic integrity
+protection.
+*/
+#undef FF_WLAN_AUTHENTICATION_ONLY_SUPPORT                
 
 /** #FF_WLAN_EXTENSIONS 
 Device supports extended WLAN functionalities e.g. for association and
@@ -1012,7 +1550,13 @@
 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_WMDRM_DLA_SUPPORT 
+This boolean feature flag indicates if WMDRM Direct License Acquisition is
+supported or not.
+*/
+#undef FF_WMDRM_DLA_SUPPORT                               
 
 /** #FF_XML_IDLE_THEME_BASIC_IDLE 
 Controls if Basic idle theme is going to image or not.
@@ -1038,7 +1582,7 @@
 The default language that is selected during bootup (this selection is
 overridden by the sim language selection). 
 */
-#define LANGPACK_DEFAULTLANG                               
+#define LANGPACK_DEFAULTLANG                               DEFINED
 
 /** #LANGUAGE_ARABIC 
 included Arabic
@@ -1331,6 +1875,23 @@
 */
 #define LANGUAGE_VIETNAMESE                                
 
+/** #SYMBIAN_INCLUDE_LOCATION_NPE_DSM 
+To Include the AGPS NPE Integration module.
+
+*/
+#undef SYMBIAN_INCLUDE_LOCATION_NPE_DSM                   
+
+/** #SYMBIAN_INCLUDE_LOCATION_SUPL_POS_INIT 
+Includes the SUPL Pos message plugin.
+*/
+#undef SYMBIAN_INCLUDE_LOCATION_SUPL_POS_INIT             
+
+/** #SYMBIAN_INCLUDE_LOCATION_SUPL_PROXY 
+Includes the SUPL proxy protocol module and supporting APIs (Terminal initiation
+API, Pos message API, Privacy request API, Network privacy API).
+*/
+#undef SYMBIAN_INCLUDE_LOCATION_SUPL_PROXY                
+
 /** #__3D_MENU 
 3D Menu feature enhances Application Shell with animating 3D icons.
 */
@@ -1340,7 +1901,7 @@
 This flag indicates that the 3GP Extention feature is supported in
 MetadataUtility.
 */
-#undef __3GP_EXTENTION                                    
+#define __3GP_EXTENTION                                    
 
 /** #__AAC_ENCODER_PLUGIN 
 Device supports all-ARM AAC encoding capabilities.
@@ -1353,16 +1914,16 @@
 #define __AAC_PLUS_DECODER_PLUGIN                          
 
 /** #__ACTIVE_IDLE 
-"The Active Idle includes several plugins to display different content.
+The Active Idle includes several plugins to display different content.
 Additional feature flags for them will be requested separately as the necessity
 for them to be optional arises.At the moment this flag will cover all Active
-Idle mandatory features."
+Idle mandatory features.
 */
 #undef __ACTIVE_IDLE                                      
 
 /** #__ALLOW_UPGRADE_HELIX 
-"Support for Aftermarket update of Codecs, and File Formats. To allow the helix
-dlls to be upgraded using a SISX file. "
+Support for Aftermarket update of Codecs, and File Formats. To allow the helix
+dlls to be upgraded using a SISX file.
 */
 #define __ALLOW_UPGRADE_HELIX                              
 
@@ -1372,9 +1933,9 @@
 #undef __APP_CSD_SUPPORT                                  
 
 /** #__AUDIO_EFFECTS_API 
-"Device supports utility APIs and framework for Series 60 Audio applications to
+Device supports utility APIs and framework for Series 60 Audio applications to
 enable predefined audio effects with audio play/record utilities. Features lilke
-Volume, Graphical Equalizer, Reverb are possible."
+Volume, Graphical Equalizer, Reverb are possible.
 */
 #define __AUDIO_EFFECTS_API                                
 
@@ -1412,9 +1973,9 @@
 #undef __BRIGHTNESS_CONTROL                               
 
 /** #__BTIC_BINARIES_CHECK_ENABLED 
-"In addition to the SWI certificate store check (defined by __BTIC_ENABLED),
-also binaries (having TCB or DRM capability) in c: drive are integrity checked
-during boot."
+In addition to the SWI certificate store check (defined by __BTIC_ENABLED), also
+binaries (having TCB or DRM capability) in c: drive are integrity checked during
+boot.
 */
 #undef __BTIC_BINARIES_CHECK_ENABLED                      
 
@@ -1473,9 +2034,9 @@
 #undef __CUSTOMISED_RFS                                   
 
 /** #__DEFAULT_CONNECTION 
-Initial connection selection enables automatic 'usage of default destination
+Initial connection selection enables automatic usage of default destination
 groups (like Internet) instead of single IAPs when starting network connections.
-Deprecated in 5.0.
+Deprecated in S60 5.0.
 */
 #undef __DEFAULT_CONNECTION                               
 
@@ -1532,13 +2093,13 @@
 /** #__FLASH_LITE_BROWSER_PLUGIN 
 Device supports Macromedia Flash Lite plugin for Web Browser
 */
-#undef __FLASH_LITE_BROWSER_PLUGIN                        
+#define __FLASH_LITE_BROWSER_PLUGIN                        
 
 /** #__FLASH_LITE_VIEWER 
 Device supports Macromedia Flash Lite Viewer for opening and playing Flash
 content files (.SWF).
 */
-#undef __FLASH_LITE_VIEWER                                
+#define __FLASH_LITE_VIEWER                                
 
 /** #__FM_RADIO 
 Device contains support for FM radio (TunerUtility and RadioServer components).
@@ -1551,7 +2112,7 @@
 #define __HANDWRITING_RECOGNITION_INPUT                    
 
 /** #__HSXPA_SUPPORT 
-"When the feature flag is set, HSDPA setting item is visible for the user."
+When the feature flag is set, HSDPA setting item is visible for the user.
 */
 #define __HSXPA_SUPPORT                                    
 
@@ -1577,31 +2138,31 @@
 AAC CMMFCodec (all-ARM software implementation) is included in build  to be used
 by some other client than controller plug-in component.
 */
-#undef __INCLUDE_AAC_CMMFCODEC                            
+#define __INCLUDE_AAC_CMMFCODEC                            
 
 /** #__INCLUDE_AMR_NB_CMMFCODEC 
 AMR NB CMMFCodec (all-ARM software implementation) is included in build to be
 used by some other client  than controller plug-in component.
 */
-#undef __INCLUDE_AMR_NB_CMMFCODEC                         
+#define __INCLUDE_AMR_NB_CMMFCODEC                         
 
 /** #__INCLUDE_AMR_WB_CMMFCODEC 
 AMR WB CMMFCodec (all-ARM software implementation) is included in build  to be
 used by some other client than controller plug-in component.
 */
-#undef __INCLUDE_AMR_WB_CMMFCODEC                         
+#define __INCLUDE_AMR_WB_CMMFCODEC                         
 
 /** #__INCLUDE_EAACPLUS_CMMFCODEC 
 This flag is used to indicate that the eAAC+ soft codec should be included in
 ROM.
 */
-#undef __INCLUDE_EAACPLUS_CMMFCODEC                       
+#define __INCLUDE_EAACPLUS_CMMFCODEC                       
 
 /** #__INCLUDE_MP3_CMMFCODEC 
 MP3 CMMFCodec (all-ARM software implementation) is included in build  to be used
 by some other client than controller plug-in component.
 */
-#undef __INCLUDE_MP3_CMMFCODEC                            
+#define __INCLUDE_MP3_CMMFCODEC                            
 
 /** #__INCLUDE_QCELP_CMMFCODEC 
 QCELP CMMFCodec (all-ARM software implementation) is included in build  to be
@@ -1637,7 +2198,9 @@
 binaries have been delivered to the licensee. More information is available in
 __JAVA flag definition."
 */
-#undef __JAVA_STUBS                                       
+// darios: __JAVA_STUBS must be enabled see bug 2616
+//#undef __JAVA_STUBS                                       
+#define __JAVA_STUBS                                       
 
 /** #__LAYOUT208_208 
 Device supports 208x208 resolution (square)
@@ -1690,8 +2253,8 @@
 #undef __LOCATIONGPSHW                                    
 
 /** #__LOCATION_CENTRE 
-"Support for Location Centre. When enabled, Location Centre will be visible in
-Application Shell."
+Support for Location Centre. When enabled, Location Centre will be visible in
+Application Shell.
 */
 #define __LOCATION_CENTRE                                  
 
@@ -1703,7 +2266,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.
@@ -1733,8 +2296,8 @@
 #define __MTP_PROTOCOL_SUPPORT                             
 
 /** #__NEWSTICKER 
-"This feature displays a 'CNN type' ticker of text pushed via cell broadcast,
-onto the idle screen of the phone."
+This feature displays a 'CNN type' ticker of text pushed via cell broadcast,
+onto the idle screen of the phone.
 */
 #undef __NEWSTICKER                                       
 
@@ -1747,7 +2310,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
@@ -1762,9 +2325,9 @@
 #define __OPENGL_ES_3DAPI                                  
 
 /** #__OPENGL_ES_SW_IMPLEMENTATION 
-"Device has a software implementation of OpenGL ES and EGL. No hardware support.
+Device has a software implementation of OpenGL ES and EGL. No hardware support.
 If __OPENGL_ES_3DAPI is enabled, either HW or SW implementation should exist. If
-HW is not present, this flag should be enabled."
+HW is not present, this flag should be enabled.
 */
 #define __OPENGL_ES_SW_IMPLEMENTATION                      
 
@@ -1776,9 +2339,9 @@
 #define __OPERATOR_CACHE                                   
 
 /** #__OPERATOR_MENU 
-"Device contains Operator menu application.  It is a wrapper to Browser
+Device contains Operator menu application.  It is a wrapper to Browser
 application and allows using operator specific application icon (and label), and
-allows opening wanted URL initially."
+allows opening wanted URL initially.
 */
 #define __OPERATOR_MENU                                    
 
@@ -1957,7 +2520,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.
@@ -2079,7 +2642,7 @@
 /** #__VFP_HW_SUPPORT 
 The device supports for vector floating-point (VFP) architecture
 */
-#undef __VFP_HW_SUPPORT                                   
+#define __VFP_HW_SUPPORT                                   
 
 /** #__VIBRA 
 Indicates whether a device has a vibra support.
@@ -2145,4 +2708,54 @@
 */
 #define __XDM_XCAP                                         
 
-#endif // __BLDPUBLIC_HRH 
\ No newline at end of file
+/** Features added from bldcustomsw.hrh (copied from bldcustomsw.hrh)*/
+
+/** #FF_MTP_ALBUM_ART */
+#undef FF_MTP_ALBUM_ART
+
+/** #FF_MUSIC_PATH_PLUGIN */
+#undef FF_MUSIC_PATH_PLUGIN
+
+/** #FF_POWER_KEY_AS_KEYGUARD */
+#undef FF_POWER_KEY_AS_KEYGUARD
+
+/** #FF_DISPLAY_NETWORK_NAME_AFTER_CS_REGISTRATION */
+#undef FF_DISPLAY_NETWORK_NAME_AFTER_CS_REGISTRATION
+
+/** #FF_MANUAL_SELECTION_POPULATED_PLMN_LIST */
+#undef FF_MANUAL_SELECTION_POPULATED_PLMN_LIST
+
+/** #FF_MOBILITY_MANAGEMENT_ERRORS */
+#undef FF_MOBILITY_MANAGEMENT_ERRORS
+
+/** #FF_SERVICE_CALL_WHILE_PHONE_LOCKED */
+#undef FF_SERVICE_CALL_WHILE_PHONE_LOCKED
+
+/** #FF_LOCATIONSYSUI_HIDE_POSITIONING_MENU */
+#undef FF_LOCATIONSYSUI_HIDE_POSITIONING_MENU
+
+/** #FF_MASTER_RESET_AND_CLEAR_SUBMENU */
+#undef FF_MASTER_RESET_AND_CLEAR_SUBMENU
+
+/** #FF_SIMLOCK_UI */
+#undef FF_SIMLOCK_UI
+
+/** #FF_ENTRY_POINT_FOR_VIDEO_SHARE */
+#undef FF_ENTRY_POINT_FOR_VIDEO_SHARE
+
+/** #FF_IMS_DEREGISTRATION_IN_OFFLINE */
+#undef FF_IMS_DEREGISTRATION_IN_OFFLINE
+
+/** #FF_IMS_DEREGISTRATION_IN_RFS */
+#undef FF_IMS_DEREGISTRATION_IN_RFS
+
+/** #FF_IMS_DEREGISTRATION_IN_VPN */
+#undef FF_IMS_DEREGISTRATION_IN_VPN
+
+/** #FF_INTRANET_BROWSING */
+#undef FF_INTRANET_BROWSING         
+
+/** #FF_HOME_SCREEN_EASY_DIALING */
+#define FF_HOME_SCREEN_EASY_DIALING                                  
+
+#endif // __BLDPUBLIC_HRH
--- a/sf_config/config/inc/defaultcaps.hrh	Tue May 11 17:20:40 2010 +0300
+++ b/sf_config/config/inc/defaultcaps.hrh	Tue May 18 17:16:07 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2004 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"
@@ -11,10 +11,13 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:  Platform security capabilities - Default capabilities for ROM 
+*                based sw.
 *
 */
 
+
+
 #ifndef DEFAULTCAPS_HRH
 #define DEFAULTCAPS_HRH
 
--- a/sf_config/config/inc/features.hrh	Tue May 11 17:20:40 2010 +0300
+++ b/sf_config/config/inc/features.hrh	Tue May 18 17:16:07 2010 +0100
@@ -14,7 +14,6 @@
 * Description: 
 *
 */
-
 /*
 * deprecated, use bldvariant.hrh instead
 */
--- a/sf_config/config/inc/privateruntimeids.hrh	Tue May 11 17:20:40 2010 +0300
+++ b/sf_config/config/inc/privateruntimeids.hrh	Tue May 18 17:16:07 2010 +0100
@@ -15,6 +15,7 @@
 *
 */
 
+
 #ifndef __PRIVATERUNTIMEIDS_HRH
 #define __PRIVATERUNTIMEIDS_HRH
 
--- a/sf_config/config/inc/publicruntimeids.hrh	Tue May 11 17:20:40 2010 +0300
+++ b/sf_config/config/inc/publicruntimeids.hrh	Tue May 18 17:16:07 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/sf_config/config/inc/variant.cfg	Tue May 11 17:20:40 2010 +0300
+++ b/sf_config/config/inc/variant.cfg	Tue May 18 17:16:07 2010 +0100
@@ -1,1 +1,2 @@
 \epoc32\include\bldvariant.hrh
+ENABLE_ABIV2_MODE
--- a/sf_config/config/japan/inc/bldregional.hrh	Tue May 11 17:20:40 2010 +0300
+++ b/sf_config/config/japan/inc/bldregional.hrh	Tue May 18 17:16:07 2010 +0100
@@ -129,4 +129,4 @@
 #undef __THAI_CALENDAR                                     
  
 
-#endif // __BLDREGIONAL_HRH 
\ No newline at end of file
+#endif // __BLDREGIONAL_HRH 
--- a/sf_config/config/western/inc/bldregional.hrh	Tue May 11 17:20:40 2010 +0300
+++ b/sf_config/config/western/inc/bldregional.hrh	Tue May 18 17:16:07 2010 +0100
@@ -129,4 +129,4 @@
 #define __THAI_CALENDAR                                     
  
 
-#endif // __BLDREGIONAL_HRH 
\ No newline at end of file
+#endif // __BLDREGIONAL_HRH 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/F32/F32.iby	Tue May 18 17:16:07 2010 +0100
@@ -0,0 +1,103 @@
+/*
+* 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 the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef __F32_IBY__
+#define __F32_IBY__
+
+#include <bldprivate.hrh>    // TODO //
+
+/*########################################################################*/
+/*#	                          File Server			                           #*/
+/*#					                                                             #*/
+/*########################################################################*/
+
+
+secondary=        ABI_DIR\DEBUG_DIR\efile.exe		        sys\bin\efile.exe  FIXED HEAPMAX(0x80000)
+file=			        ABI_DIR\DEBUG_DIR\efsrv.dll           sys\bin\efsrv.dll
+file=			        ABI_DIR\DEBUG_DIR\e32strt.exe	        sys\bin\estart.exe HEAPMAX(0x2000)	// Symbian Base Starter 
+data=			        \epoc32\rom\syborg\ESTART.TXT	        \sys\data\ESTART.TXT			          // Local Drives Definition File 
+extension[VARID]=	KERNEL_DIR\DEBUG_DIR\ELOCD.LDD	      \sys\bin\ELOCD.LDD			            // Local Media Drives Access Driver
+
+device[VARID]=KERNEL_DIR\DEBUG_DIR\d_ftrace.ldd             \sys\bin\d_ftrace.ldd   // FileSystem Trace Driver
+/* FAT System Filename conversion plugins */
+#include <fatcharsetconv.iby> 														
+
+
+/* File Systems Supported */
+
+#ifdef WITH_EXFAT
+file=ABI_DIR\DEBUG_DIR\exfat.fsy                            sys\bin\exfat.fsy
+#endif
+
+#ifdef WITH_AUTOMOUNTER
+file=ABI_DIR\DEBUG_DIR\automounter.fsy                      sys\bin\automounter.fsy
+#endif
+
+
+#ifndef CUSTOM_ELOCAL
+file=ABI_DIR\DEBUG_DIR\efat32.fsy			    \sys\bin\ELocal.fsy
+#endif
+
+// PREQ2540: Prepare "LFFS" NOR Flash File System TPIP for Symbian Foundation
+// This PREQ removes the LFFS File System component from the rlease codeline.
+// Only define WITH_ELLFS_FSY macro on development branches where the component
+// has been retained.
+#ifdef WITH_ELFFS_FSY
+file=ABI_DIR\DEBUG_DIR\elffs.fsy                            \sys\bin\ELffs.fsy
+#endif
+
+#ifdef WITH_NAND
+file=ABI_DIR\BUILD_DIR\nandftl.fxt                          \sys\bin\nandftl.fxt
+file=ABI_DIR\BUILD_DIR\ecomp.fsy                            \sys\bin\ecomp.fsy
+file=ABI_DIR\BUILD_DIR\erofs.fsy                            \sys\bin\erofs.fsy
+#endif
+
+#if defined(WITH_NAND2) || defined(WITH_ONENAND) || defined (WITH_INTERNAL_MMC)
+file=ABI_DIR\BUILD_DIR\ecomp.fsy                            \sys\bin\ecomp.fsy
+file=ABI_DIR\BUILD_DIR\erofs.fsy                            \sys\bin\erofs.fsy
+#endif
+
+#ifdef WITH_ISO9660
+file=ABI_DIR\DEBUG_DIR\iso9660.fsy                          \sys\bin\Iso9660.fsy
+#endif
+
+#ifdef WITH_NTFS
+file=ABI_DIR\DEBUG_DIR\ntfs.fsy                             \sys\bin\Ntfs.fsy
+#endif
+
+#if !(defined(INST_X86) || defined(INST_X86GCC))
+file=ABI_DIR\DEBUG_DIR\USBCSC_bil.dll                       \sys\bin\usbcsc_bil.dll
+#endif
+
+#ifdef WITH_MASS_STORAGE
+#ifdef USE_MSCDB
+file=ABI_DIR\DEBUG_DIR\msfs_db.fsy                          \sys\bin\msfs.fsy
+#else
+file=ABI_DIR\DEBUG_DIR\msfs.fsy                             \sys\bin\msfs.fsy
+#endif
+#endif
+
+/*########################################################################*/
+/*#	                          Symbian Domain Manager                     #*/
+/*#                                                                      #*/
+/*########################################################################*/
+
+/* Symbian Domain Manager */
+file=ABI_DIR\DEBUG_DIR\domainSrv.exe                     \sys\bin\domainSrv.exe
+file=ABI_DIR\DEBUG_DIR\domainCli.dll                     \sys\bin\domainCli.dll
+file=ABI_DIR\DEBUG_DIR\domainPolicy.dll                  \sys\bin\domainPolicy.dll										
+#endif /* __F32_IBY__ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/S60Macros.iby	Tue May 18 17:16:07 2010 +0100
@@ -0,0 +1,114 @@
+/*
+* ============================================================================
+*  Name     : S60Macros.iby
+*  Part of  : ROM Build Process
+*
+*  Description:
+*  Build ROM Information
+*
+*  Version:
+*
+*  Copyright (C) 2002 Nokia Corporation.
+*  This material, including documentation and any related 
+*  computer programs, is protected by copyright controlled by 
+*  Nokia Corporation. All rights are reserved. Copying, 
+*  including reproducing, storing,  adapting or translating, any 
+*  or all of this material requires the prior written consent of 
+*  Nokia Corporation. This material also contains confidential 
+*  information which may not be disclosed to others without the 
+*  prior written consent of Nokia Corporation.
+*
+* ============================================================================
+*/
+
+#ifndef __S60MACROS_IBY__
+#define __S60MACROS_IBY__
+
+// Scalable image
+#ifdef RD_SCALABLE_UI
+ #define SCALABLE_IMAGE(path,target,name) __SCALABLE_IMAGE(DATAZ_,path,target,name)
+#else
+ #define SCALABLE_IMAGE(path,target,name) AUTO-BITMAP=DATAZ_\ ## path ## \ ## name ## .mbm  target ## \ ## name ## .mbm
+#endif
+
+
+
+// App files
+#ifndef RD_APPS_TO_EXES
+ #define S60_APP_EXE(NAME) file=ABI_DIR\BUILD_DIR\ ## NAME ## .app                   System\Apps\ ## NAME ## \ ## NAME ## .app
+ #define S60_APP_EXE_UDEB(NAME) file=ABI_DIR\UDEB\ ## NAME ## .app                   System\Apps\ ## NAME ## \ ## NAME ## .app
+#else // RD_APPS_TO_EXES
+ #define S60_APP_EXE(NAME) file=ABI_DIR\BUILD_DIR\ ## NAME ## .exe                   PROGRAMS_DIR\ ## NAME ## .exe
+ #define S60_APP_EXE_UDEB(NAME) file=ABI_DIR\UDEB\ ## NAME ## .exe                   PROGRAMS_DIR\ ## NAME ## .exe
+#endif // RD_APPS_TO_EXES
+
+
+
+// App bitmap
+#ifdef RD_APPS_TO_EXES
+ #ifdef RD_SCALABLE_UI
+  #define S60_APP_BITMAP(NAME) __SCALABLE_IMAGE(DATAZ_,APP_BITMAP_DIR,APP_BITMAP_DIR, ## NAME ## )
+  #define S60_APP_BITMAP2(DIR,NAME) __SCALABLE_IMAGE(DATAZ_,APP_BITMAP_DIR,APP_BITMAP_DIR, ## NAME ## )
+ #else // RD_SCALABLE_UI
+  #define S60_APP_BITMAP(NAME) AUTO-BITMAP=DATAZ_\APP_BITMAP_DIR\ ## NAME ## .mbm APP_BITMAP_DIR\ ## NAME ## .mbm
+  #define S60_APP_BITMAP2(DIR,NAME) AUTO-BITMAP=DATAZ_\APP_BITMAP_DIR\ ## NAME ## .mbm APP_BITMAP_DIR\ ## NAME ## .mbm
+ #endif // RD_SCALABLE_UI
+#else // RD_APPS_TO_EXES
+ #ifdef RD_SCALABLE_UI
+  #define S60_APP_BITMAP(NAME) __SCALABLE_IMAGE(DATAZ_,System\Apps\ ## NAME ## ,System\Apps\ ## NAME ## , ## NAME ## )
+  #define S60_APP_BITMAP2(DIR,NAME) __SCALABLE_IMAGE(DATAZ_,System\Apps\ ## DIR ## ,System\Apps\ ## DIR ## , ## NAME ## )
+ #else // RD_SCALABLE_UI
+  #define S60_APP_BITMAP(NAME) AUTO-BITMAP=DATAZ_\System\Apps\ ## NAME ## \ ## NAME ## .mbm System\Apps\ ## NAME ## \ ## NAME ## .mbm
+  #define S60_APP_BITMAP2(DIR,NAME) AUTO-BITMAP=DATAZ_\System\Apps\ ## DIR ## \ ## NAME ## .mbm System\Apps\ ## DIR ## \ ## NAME ## .mbm
+ #endif // RD_SCALABLE_UI
+#endif // RD_APPS_TO_EXES
+
+
+
+// AIF icons/files
+#ifdef RD_SCALABLE_UI // New app framework used
+ #ifdef RD_APPS_TO_EXES
+  #ifdef __SCALABLE_ICONS
+   #define S60_APP_AIF_ICONS(NAME) data=DATAZ_\APP_BITMAP_DIR\ ## NAME ## _AIF.MIF    APP_BITMAP_DIR\ ## NAME ## _aif.mif
+  #else
+   #define S60_APP_AIF_ICONS(NAME) AUTO-BITMAP=DATAZ_\APP_BITMAP_DIR\ ## NAME ## _AIF.MBM       APP_BITMAP_DIR\ ## NAME ## _aif.mbm
+  #endif
+ #else // RD_APPS_TO_EXES
+  #ifdef __SCALABLE_ICONS
+   #define S60_APP_AIF_ICONS(NAME) data=ZSYSTEM\APPS\ ## NAME ## \ ## NAME ## _AIF.MIF       System\Apps\ ## NAME ## \ ## NAME ## _aif.mif
+  #else
+   #define S60_APP_AIF_ICONS(NAME) AUTO-BITMAP=ZSYSTEM\APPS\ ## NAME ## \ ## NAME ## _AIF.MBM       System\Apps\ ## NAME ## \ ## NAME ## _aif.mbm
+  #endif
+ #endif // RD_APPS_TO_EXES
+ #define S60_APP_AIF_RSC(NAME) data=DATAZ_\PRIVATE\10003A3F\APPS\ ## NAME ## _reg.rsc        Private\10003a3f\apps\ ## NAME ## _reg.rsc
+ #define S60_UPGRADABLE_APP_REG_RSC(NAME) data=DATAZ_\PRIVATE\10003A3F\APPS\ ## NAME ## _reg.rsc        Private\10003a3f\import\apps\ ## NAME ## _reg.rsc
+
+#else // RD_SCALABLE_UI Old app framework used
+ #define S60_APP_AIF_ICONS(NAME) AIF=ZSYSTEM\APPS\ ## NAME ## \ ## NAME ## .AIF            System\Apps\ ## NAME ## \ ## NAME ## .aif
+ #define S60_APP_AIF_RSC(NAME)
+ #define S60_UPGRADABLE_APP_REG_RSC(NAME)
+#endif
+
+
+
+//Resource file(s)
+#ifdef RD_APPS_TO_EXES
+ #define S60_APP_RESOURCE(NAME)  data=DATAZ_\APP_RESOURCE_DIR\ ## NAME ## .RSC   APP_RESOURCE_DIR\ ## NAME ## .rsc
+ #define S60_APP_RESOURCE2(APPNAME,RESNAME) data=DATAZ_\APP_RESOURCE_DIR\ ## RESNAME ## .RSC   APP_RESOURCE_DIR\ ## RESNAME ## .rsc
+ #ifndef RD_SCALABLE_UI // Old app framework used
+  #define S60_APP_CAPTION(NAME)  data=DATAZ_\APP_RESOURCE_DIR\ ## NAME ## _CAPTION.RSC   APP_RESOURCE_DIR\ ## NAME ## _caption.rsc
+ #else
+  #define S60_APP_CAPTION(NAME)
+ #endif // RD_SCALABLE_UI
+#else // RD_APPS_TO_EXES
+ #define S60_APP_RESOURCE(NAME)  data=ZSYSTEM\APPS\ ## NAME ## \ ## NAME ## .RSC    System\Apps\ ## NAME ## \ ## NAME ## .rsc
+ #define S60_APP_RESOURCE2(APPNAME,RESNAME) data=ZSYSTEM\APPS\ ## APPNAME ## \ ## RESNAME ## .RSC    System\Apps\ ## APPNAME ## \ ## RESNAME ## .rsc
+ #ifndef RD_SCALABLE_UI // Old app framework used
+  #define S60_APP_CAPTION(NAME)  data=ZSYSTEM\APPS\ ## NAME ## \ ## NAME ## _CAPTION.RSC   System\Apps\ ## NAME ## \ ## NAME ## _caption.rsc
+ #else
+  #define S60_APP_CAPTION(NAME)
+ #endif // RD_SCALABLE_UI
+#endif // RD_APPS_TO_EXES
+
+
+#endif //__S60MACROS_IBY__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/SyborgMinigui.oby	Tue May 18 17:16:07 2010 +0100
@@ -0,0 +1,53 @@
+/*
+* 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 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:
+*
+*/
+
+#ifndef __SYBORG_OBY__
+#define __SYBORG_OBY__
+
+
+define OBEYFILE Syborg
+define ROMDATE	##TODAY##
+
+                                                          
+#include <data_caging_paths_for_iby.hrh>                // Generic S60 Macro Definitions
+#include "S60Macros.iby"                                // Generic S60 Macro Definitions
+
+REM ##############################################################################
+
+REM Symbian UI Images OS Kernel Level
+
+REM ##############################################################################
+
+#include "header.iby"                         // EABI and DEBUG_DIR defines for Imaker
+
+
+#include "./baseport/Syborg_baseport.iby"                 // Kernel and Baseport Drivers
+
+#include "./F32/F32.iby"                                  // FileServer,File systems, Base Starter , Domain Manager	
+
+REM ##############################################################################
+
+REM Symbian UI Images OS Level
+
+REM ##############################################################################
+
+REM Including the Minigui Content
+
+#include "minigui_syborg.iby"
+
+
+#endif
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/baseport/compsupp.iby	Tue May 18 17:16:07 2010 +0100
@@ -0,0 +1,69 @@
+// 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 "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file contains the compiler's run-time support libraries.
+// 
+//
+
+// Make the file acceptable to "e32/rombuild/rom.bat."
+#if defined(COMPSUPP_DIR) && defined(BUILD)
+#   define ABI_DIR      \Epoc32\Release\##COMPSUPP_DIR
+#   define DEBUG_DIR    BUILD
+#endif
+
+#if defined(RVCT2_1)
+#   error "RVCT 2.1 is not supported."
+#endif
+
+// Set a default run-time version. In the future, 3.1 or 4.X should be the default.
+#if !( defined(RVCT2_2) || defined(RVCT3_1) || defined(RVCT4_0) )
+#   define RVCT4_0
+#endif
+
+#if defined(VFPHELPERS) && !defined(NOVFPHELPERS)
+#   define FP_EXT _vfpv2.dll
+#else
+#   define FP_EXT .dll
+#endif
+
+file=ABI_DIR\##DEBUG_DIR\scppnwdl.dll               \sys\bin\scppnwdl.dll
+
+file=ABI_DIR\##DEBUG_DIR\drtaeabi.dll               \sys\bin\drtaeabi.dll
+file=ABI_DIR\##DEBUG_DIR\dfpaeabi##FP_EXT           \sys\bin\dfpaeabi.dll
+
+// Support for old binaries.
+//Emilio file=ABI_DIR\##DEBUG_DIR\dfprvct-thunk.dll			\sys\bin\dfprvct-thunk.dll
+//Emilio alias \sys\bin\dfprvct-thunk.dll					\sys\bin\dfprvct2_2-thunk.dll
+//Emilio alias \sys\bin\dfprvct-thunk.dll					\sys\bin\dfprvct2_1-thunk.dll
+
+#define RVCT2_2
+#if defined(RVCT2_2)
+REM RVCT 2.2 support
+    file=ABI_DIR\##DEBUG_DIR\drtrvct2_2##FP_EXT     \sys\bin\drtrvct2_2.dll
+    file=ABI_DIR\##DEBUG_DIR\dfprvct2_2##FP_EXT     \sys\bin\dfprvct2_2.dll
+    
+    // Support for old binaries.
+    alias \sys\bin\drtrvct2_2.dll                   \sys\bin\drtrvct2_1.dll
+    alias \sys\bin\dfprvct2_2.dll                   \sys\bin\dfprvct2_1.dll
+#elif defined(RVCT3_1) || defined(RVCT4_0)
+REM RVCT 4.0 support
+    file=ABI_DIR\##DEBUG_DIR\drtrvct3_1##FP_EXT     \sys\bin\drtrvct3_1.dll
+    file=ABI_DIR\##DEBUG_DIR\dfprvct3_1##FP_EXT     \sys\bin\dfprvct3_1.dll
+    
+    // Support for old binaries.
+    alias \sys\bin\drtrvct3_1.dll                   \sys\bin\drtrvct2_2.dll
+    alias \sys\bin\dfprvct3_1.dll                   \sys\bin\dfprvct2_2.dll
+    alias \sys\bin\drtrvct3_1.dll                   \sys\bin\drtrvct2_1.dll
+    alias \sys\bin\dfprvct3_1.dll                   \sys\bin\dfprvct2_1.dll
+#endif
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/baseport/syborg_baseport.iby	Tue May 18 17:16:07 2010 +0100
@@ -0,0 +1,159 @@
+/*
+* 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 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: Used by techview roms
+*
+*/
+
+#ifndef __SYBORG_BASEPORT__ 
+#define __SYBORG_BASEPORT__
+
+/*############################################*/
+/*#	ROM Definitions			                     #*/
+/*#					                                 #*/
+/*############################################*/
+
+
+define SYBORG_L1		0x0b0a0001
+define VARIANT			syborg
+define VARID			  SYBORG_L1
+define ASSP_DIR			EPOCROOT##epoc32\release\syborg
+//define ROMMEGS			15		/* !! HEX !! */
+define _PLATFORM_NAME_		_syborg_
+
+
+kerneltrace 0x80000002
+
+
+memmodel multiple 0x100000
+//memmodel flexible 0x100000 0x1000 -0x4000
+//dlldatatop 0x7f000000
+
+
+trace 0x10
+collapse arm gcc 0
+multikernel
+
+
+version=0.01
+bootbinary=\epoc32\release\armv5\_syborg_bootloader_bootrom.bin
+
+
+debugport 0
+romsize=0x8000000
+romlinearbase=0x80000000
+romalign=0x10
+kerneldataaddress=0xC8000000
+kernelheapmin=0x08000			// calculated at boot time
+kernelheapmax=0x00FFF000
+dataaddress=0x400000
+defaultstackreserve=0x200000
+romchecksum=0x12345678
+
+
+nowrapper				// no rom header
+
+
+#ifdef UNICODE
+unicode
+#endif
+
+#define HEAPMAX(x)
+
+
+/*#################################################################################*/
+/*#	                   KERNEL, Compiler Support and User Binaries	  	            #*/
+/*#					                                                                      #*/
+/*#################################################################################*/
+
+
+/* The Symbian Kernel and Kernel Things. */
+// Must align kernel to 16K boundary since exception vectors will be mapped at 0xFFFF0000
+primary[VARID]=		KERNEL_DIR\DEBUG_DIR\_PLATFORM_NAME_EKERN.EXE		          \sys\bin\EKERN.EXE	code-align 0x4000
+file=			        ABI_DIR\DEBUG_DIR\_PLATFORM_NAME_euser.dll		            \sys\bin\EUser.dll	// EUser Library
+
+
+extension[VARID]=	KERNEL_DIR\DEBUG_DIR\EXSTART.DLL			                    \sys\bin\EXSTART.DLL	// Symbian First Stage Starter
+file=			        ABI_DIR\DEBUG_DIR\RPIPE.DLL				                        \sys\bin\RPIPE.dll	// ?? To Find
+extension[VARID]=	KERNEL_DIR\DEBUG_DIR\EVFP.DLL				                      \sys\bin\EVFP.DLL	// IEEE-mode VFP support.
+file=			        ABI_DIR\DEBUG_DIR\ektran.dll				                      \sys\bin\EKTran.dll	// ?? To Find
+
+
+// Compiler and ABI support libraries
+#include <compsupp.iby>					
+
+
+/*#################################################################################*/
+/*#	                   HW Specific Binaries, Silicon HW Baseport       	  #*/
+/*#					                                          #*/
+/*#################################################################################*/
+
+
+/* Hardware Platform Registers and Funcionality ( HW Registers, HW Timers, Mailboxes, etcr ) */
+variant[VARID]=		KERNEL_DIR\DEBUG_DIR\_PLATFORM_NAME_KASYBORG.DLL	  \sys\bin\KASYBORG.DLL	// HW Resources 
+
+// Kernel pipe
+
+device[VARID]=    KERNEL_DIR\DEBUG_DIR\pipelib.ldd					    \sys\bin\pipelib.ldd
+
+/* Display Controller, LCD HW Interface, */
+//extension[VARID]=	KERNEL_DIR\DEBUG_DIR\_PLATFORM_NAME_LCD.DLL		      \sys\bin\LCD.DLL 	// Frame Buffer for Syborg
+//file=			        KERNEL_DIR\DEBUG_DIR\EDISP.dll	                    \sys\bin\EDISP.DLL	// Display Driver for TexShell
+
+/* Display Driver */
+device[VARID]=    KERNEL_DIR\DEBUG_DIR\display.ldd	                    \sys\bin\display0.ldd	// Display Driver for Syborg LDD
+extension[VARID]=	KERNEL_DIR\DEBUG_DIR\_syborg_svpframebuffer.dll       \sys\bin\LCD.DLL 	       // Frame Buffer for Syborg PDD
+file=             ABI_DIR\DEBUG_DIR\_generic_scdv.dll                   \sys\bin\scdv.dll           // Generic Driver with GCE Support
+
+
+/* UART Serial Port HW Interfaces and Drivers */
+device[VARID]=		KERNEL_DIR\DEBUG_DIR\ECOMM.LDD				              \sys\bin\ECOMM.LDD	// Serial Port Drivers
+device[VARID]=		KERNEL_DIR\DEBUG_DIR\_PLATFORM_NAME_ESERIAL.PDD		  \sys\bin\ESERIAL.PDD	// Serial Port Drivers
+
+extension[VARID]=	KERNEL_DIR\DEBUG_DIR\_PLATFORM_NAME_EPOINTER.DLL	  \sys\bin\EPOINTER.DLL	// ???
+
+
+/* NAND/NOR/RAM Drive HW Interface and NAND/NOR/RAM Drive Drivers */
+extension[VARID]=	KERNEL_DIR\DEBUG_DIR\_PLATFORM_NAME_MEDINT.PDD	    \sys\bin\MEDINT.PDD	// Internal RAM Media Driver
+
+
+/* Keyboard Support */ 
+extension[VARID]=	KERNEL_DIR\DEBUG_DIR\_PLATFORM_NAME_EKEYB.DLL		    \sys\bin\EKEYB.DLL	// Keyboard Driver
+file[VARID]=		  KERNEL_DIR\DEBUG_DIR\_PLATFORM_NAME_EKDATA.DLL	    \sys\bin\EKDATA.DLL	// Keyboard map
+
+
+/* Syborg Hardware Abstraction Layer */ 
+file=ABI_DIR\DEBUG_DIR\_PLATFORM_NAME_hal.dll					                 \sys\bin\Hal.dll	// Syborg HAL
+
+          
+
+/*#################################################################################*/
+/*#	              HW/SW Debug and Trace Support Specific Binaries	            	  #*/
+/*#					                                                                      #*/
+/*#################################################################################*/
+
+/* Trace and Debug Support */
+// Common monitor support. Must be before both 
+//interactive debugger and automatic logger.
+
+define BTRACEX_LDD _PLATFORM_NAME_btracex.ldd 
+
+#include <btrace.iby>
+
+
+extension[VARID]= KERNEL_DIR\DEBUG_DIR\_PLATFORM_NAME_EXMONCOMMON.DLL 	\sys\bin\EXMONCOMMON.DLL
+extension[VARID]=	KERNEL_DIR\DEBUG_DIR\_PLATFORM_NAME_EXMONDEBUG.DLL  	\sys\bin\EXMONDEBUG.DLL
+extension[VARID]=	KERNEL_DIR\DEBUG_DIR\KDEBUG.DLL				                \sys\bin\KDEBUG.DLL
+//device[VARID]=	KERNEL_DIR\DEBUG_DIR\D_DEBUG.LDD			                \sys\bin\D_DEBUG.LDD
+
+#endif /* __SYBORG_BASEPORT__ */
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/group/bld.inf	Tue May 18 17:16:07 2010 +0100
@@ -0,0 +1,29 @@
+/*
+* Copyright (c) 2010 Symbian Foundation Ltd
+* 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:
+* Symbian Foundation Ltd - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+PRJ_PLATFORMS
+ARMV5
+
+PRJ_EXPORTS
+../F32/F32.iby                                  /epoc32/rom/config/syborg/platform/F32/
+../Baseport/compsupp.iby                        /epoc32/rom/config/syborg/platform/Baseport/
+../Baseport/syborg_baseport.iby                 /epoc32/rom/config/syborg/platform/Baseport/
+../image_conf_Syborg.mk                         /epoc32/rom/config/syborg/platform/
+../minigui_syborg.iby                           /epoc32/rom/config/syborg/platform/
+../mytraces.txt                                 /epoc32/rom/config/syborg/platform/
+../S60Macros.iby                                /epoc32/rom/config/syborg/platform/
+../SyborgMinigui.oby                            /epoc32/rom/config/syborg/platform/
+../header.iby                                   /epoc32/rom/config/syborg/platform/
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/header.iby	Tue May 18 17:16:07 2010 +0100
@@ -0,0 +1,171 @@
+// Copyright (c) 2005-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 "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+// 
+// Contributors:
+//
+
+#ifndef __HEADER_IBY__
+#define __HEADER_IBY__
+
+unicode
+
+romsize=0x##ROMMEGS##00000
+time=ROMDATE 12:00:00
+
+#ifdef CDMA
+define CDMA_SUFFIX _cdma
+#else
+define CDMA_SUFFIX ## 		// nothing
+#endif
+
+#ifdef _NAND
+define NAND_SUFFIX .nand
+#else
+define NAND_SUFFIX ##		// nothing
+#endif
+
+#ifdef _NAND2
+define NAND_SUFFIX .nand
+#endif
+
+romname=##VARIANT##_##BUILDNO##LANGID##.##OBEYFILE##CDMA_SUFFIX##NAND_SUFFIX.IMG
+
+#ifdef _NAND
+ECHO Preparing NAND core image with associated ROFS image
+
+#ifndef _ROFS_SIZE
+#define _ROFS_SIZE	32000000	// 32 Meg default
+#endif
+define ROFS_SIZE	_ROFS_SIZE
+
+compress
+rom_image 1 rofs size=ROFS_SIZE non-xip compress
+
+#endif
+
+
+#ifdef _NAND2
+ECHO Preparing NAND core image with associated ROFS image
+
+#ifndef _ROFS_SIZE
+#define _ROFS_SIZE	32000000	// 32 Meg default
+#endif
+define ROFS_SIZE	_ROFS_SIZE
+
+compress
+rom_image 1 rofs size=ROFS_SIZE non-xip compress
+
+#endif
+
+REM ROM version number
+
+version=##VERSION##(##BUILDNO##)
+
+#ifdef _FULL_DEBUG
+#ifndef _DEBUG
+#define _DEBUG // _FULL_DEBUG implies _DEBUG
+#endif
+define BUILD_DIR udeb
+#else
+define BUILD_DIR urel
+#endif
+
+#ifdef _DEBUG
+define DEBUG_DIR udeb
+#else
+define DEBUG_DIR urel
+#endif
+
+ifndef _EABI
+  ifdef _ARM4
+    define _EABI ARM4
+	 ECHO Defaulting to ARM4
+  elif defined(_ARMV5)
+    define _EABI ARMV5
+	 ECHO Defaulting to ARMV5
+  endif
+endif
+
+#  ifdef _PLAT
+#    undef _EABI
+#    define _EABI _PLAT
+#	 ECHO Defaulting to _EABI
+#  endif
+
+#  ifdef _GCCE
+#    undef _EABI
+#    define _EABI GCCE
+#  elif defined(ABIV2) || defined(ABIv2)
+#    undef _EABI
+#    define _EABI ARMV5_ABIV2
+#  endif
+
+// This is to include ABIV2 specific runtime libraries. This inclusion
+// in other obey files depends on the definition of RVCT
+#ifdef _GCCE
+# define RVCT
+#endif
+
+define ABI_DIR    EPOCROOT##epoc32\release\##_EABI
+
+#ifndef _KABI
+#define _KABI _EABI
+#endif
+
+define KERNEL_DIR   EPOCROOT##epoc32\release\##_KABI
+
+define DATAZ_     EPOCROOT##epoc32\data\Z     
+define ZSYSTEM    DATAZ_\System
+define ZPRIVATE   DATAZ_\Private
+define ZRESOURCE  DATAZ_\Resource
+
+define DATAC_     EPOCROOT##epoc32\data\C    
+define CSYSTEM    DATAC_\System    
+
+// default location of executables
+define SYSTEM_BINDIR  System\Libs		// will be Sys\Bin for Secure platform
+
+
+// Support for ECOM_PLUGIN
+// Format is ECOM_PLUGIN(<DLL Name>,<Resource File Name>)
+// e.g. ECOM_PLUGIN(foo.dll,12345abc.rsc)
+
+define ECOM_RSC_DIR Resource\Plugins
+define ECOM_BIN_DIR Sys\Bin
+
+
+// __ECOM_PLUGIN(emulator directory, file rom dir, dataz_, resource rom dir, filename, resource filename)
+#define ECOM_PLUGIN(file,resource) __ECOM_PLUGIN(ABI_DIR\BUILD_DIR,ECOM_BIN_DIR,DATAZ_,ECOM_RSC_DIR,file,file)
+#define ECOM_PLUGIN_UDEB(file,resource) __ECOM_PLUGIN(ABI_DIR\UDEB,ECOM_BIN_DIR,DATAZ_,ECOM_RSC_DIR,file,file)
+
+// Support for HIDE_ECOM_PLUGIN
+// Format is HIDE_ECOM_PLUGIN(<DLL Name>,<Resource File Name>)
+// e.g. HIDE_ECOM_PLUGIN(foo.dll,12345abc.rsc)
+
+// _HIDE__ECOM_PLUGIN(emulator directory, file rom dir, dataz_, resource rom dir, filename, resource filename)
+#define HIDE_ECOM_PLUGIN(file,resource) _HIDE__ECOM_PLUGIN(ABI_DIR\BUILD_DIR,ECOM_BIN_DIR,DATAZ_,ECOM_RSC_DIR,file,file)
+#define HIDE_ECOM_PLUGIN_UDEB(file,resource) _HIDE__ECOM_PLUGIN(ABI_DIR\UDEB,ECOM_BIN_DIR,DATAZ_,ECOM_RSC_DIR,file,file)
+
+#ifdef SYMBIAN_ROM_STATIC_PLUGIN_INFORMATION
+	enable_spi
+#else
+	disable_spi
+#endif
+
+// Secure platform setting - use PlatSec.oby to turn diagnostics on
+PlatSecDiagnostics OFF
+PlatSecEnforcement ON
+PlatSecEnforceSysBin ON
+PlatSecProcessIsolation ON 
+
+
+//#include "feature.iby"
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/image_conf_Syborg.mk	Tue May 18 17:16:07 2010 +0100
@@ -0,0 +1,96 @@
+#
+# 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 the License "Symbian Foundation License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+# Example version of a platform-specific configuration makefile,
+# common to many products.
+#
+
+COREPLAT_NAME    =__SYBORG__
+COREPLAT_VERSION = 1
+S60_VERSION      = 5.0
+SOS_VERSION      = 9.4
+PLATFORM_NAME    =__SYBORG__
+
+
+USE_PAGING     	= 0
+USE_ROMFILE    	= 1
+USE_ROFS	      = 0
+USE_SYMGEN     	= 0
+USE_UDEB       	= 0
+USE_VARIANTBLD 	= 0
+USE_VERGEN     	= 1
+USE_FLOAT       = 0
+
+
+PRODUCT_NAME  	= Syborg
+PLATFORM_NAME   = Syborg
+PRODUCT_TYPE  	= Syborg
+PRODUCT_MODEL 	= Syborg
+
+ARM_VERSION     = _ARMV5
+ROMMEGS         =71
+ROMDATE         =abcd 
+
+
+# CORE
+# imaker -f /epoc32/rom/config/platform/product/image_conf_product.mk core
+#(ARM_VERSION)
+COREPLAT_OPT = $(BLDROM_OPT) -D_EABI=$(ARM_VERSION)\
+  $(if $(PRODUCT_MSTNAME),-D$(call ucase,$(PRODUCT_MSTNAME))) -D$(call ucase,$(PRODUCT_NAME)) $(PRODUCT_OPT)
+
+#CORE_OBYGEN =\
+#  geniby | $(CORE_PREFIX)_core_collected.oby |\
+#    $(E32ROMINC)/core/app $(E32ROMINC)/core/mw $(E32ROMINC)/core/osext\
+#    $(call select,$(TYPE),prd,,$(E32ROMINC)/core/tools) | *.iby | \#include "%3" | end
+#
+#CORE_OBY = $(E32ROM)/master.oby $(CORE_PREFIX)_core_collected.oby <symbianos.iby> <variant/patchdata.iby>
+
+NAME            = MySyborg
+CORE_NAME 	    = Syborg
+CORE_NDNAME     = Syborg.NDcore
+CORE_OBY        = $(E32ROM)/config/Syborg/platform/SyborgMinigui.oby
+
+CORE_UDEBFILE   = $(E32ROM)/config/Syborg/platform/mytraces.txt
+CORE_ROMFILE    = $(E32ROM)/config/Syborg/platform/romfiles.txt
+CORE_NDPROMFILE	= $(E32ROM)/config/Syborg/platform/romfiles.txt
+CORE_OPT= $(COREPLAT_OPT) -es60ibymacros -DSECTION
+
+# Workaround to fix Rombuild errors:
+# "ERROR: incorrect format for time keyword..." and "The size of the ROM has not been supplied."
+CORE_OPT += --DROMMEGS=80 --DROMDATE=$(CORE_TIME) -D__BT_LOGGER__  -nofm=\epoc32\rom\include\featuredatabase.xml
+
+//-nofm=Z:\epoc32\data\z\private\10205054\features.dat
+
+//-fm=\epoc32\rom\include\featuredatabase.xml
+
+# ROFS2
+# imaker -f /epoc32/rom/config/platform/product/image_conf_product.mk langpack_01
+#
+ROFS2_OBYGEN =\
+  geniby | $(ROFS2_PREFIX)_rofs2_customer_collected.oby | $(E32ROMINC)/customer/* | *.iby | \#include "%3" | end |\
+  geniby | $(ROFS2_PREFIX)_rofs2_language_collected.oby | $(E32ROMINC)/language/* |\
+    __header__ | LOCALISE_ALL_RESOURCES_BEGIN | *.iby | \#include "%3" | __footer__ | LOCALISE_ALL_RESOURCES_END | end
+
+ROFS2_OBY = <Variant.oby> $(ROFS2_PREFIX)_rofs2_language_collected.oby $(ROFS2_PREFIX)_rofs2_customer_collected.oby
+ROFS2_OPT = $(COREPLAT_OPT) -es60ibymacros -elocalise -DLOCALES_SC_IBY -D__LOCALES_SC_IBY__
+
+
+# ROFS3
+# imaker -f /epoc32/rom/config/platform/product/image_conf_product.mk custvariant_XX
+#
+ROFS3_OBYGEN =\
+  geniby | $(ROFS3_PREFIX)_rofs3_collected.oby | $(E32ROMINC)/customervariant/* | *.iby | \#include "%3" | end
+
+ROFS3_OBY = $(ROFS3_PREFIX)_rofs3_collected.oby
+ROFS3_OPT = $(COREPLAT_OPT) -es60ibymacros
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/minigui_syborg.iby	Tue May 18 17:16:07 2010 +0100
@@ -0,0 +1,114 @@
+/*
+* 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:
+* iwanj@users.sourceforge.net - modified to make it work for Symbian^3.
+*
+* Description:
+* This OBY File is used to build miniGUI ROM Images.
+*/
+
+#ifndef __MINIGUI_OBY__
+#define __MINIGUI_OBY__
+
+define OBEYFILE minigui
+define ROMDATE ##TODAY##
+
+#define _ARMV5
+#define SYMBIAN_BASE_USE_GCE
+#define SYMBIAN_EXCLUDE_SCDV
+#undef SYMBIAN_GRAPHICS_ADAPTATION
+#define SYMBIAN_GRAPHICS_ADAPTATION SGA_SW
+#define SYMBIAN_GRAPHICS_USE_OPENWF
+#define SYMBIAN_GRAPHICS_USE_EGL_REF
+#define OPENWFCLIB_DRV <openwfc_ref.iby>
+#define __SYBORG__
+
+
+// Kernel
+//
+//#include <header.iby>
+//#include <base.iby>
+
+// NGA stack
+//
+#define SYMBIAN_GRAPHICS_USE_GCE
+#define SYMBIAN_GRAPHICS_USE_OPENWF
+
+#include <gdi.iby>
+#include <bitgdi.iby>
+#include <fntstore.iby>
+#include <fbserv.iby>
+#include <iculayoutengine.iby>
+#include <freetype.iby>
+#include <directgdi.iby>
+#include <wserv.iby>
+#include <econs_wserv.iby>
+#include <surfaceupdate.iby>
+#include <surfacemanager.iby>
+//file=\epoc32\release\ARMV5\urel\_generic_scdv.dll      sys\bin\scdv.dll
+
+data=DATAZ_\wsini_minigui.ini  \system\data\wsini.ini
+
+// miniGUI shell
+//
+#include <eshell.iby>
+
+// And the hell breaks loose :)
+// Let's just add bare minimum items enough to get graphics stack up and running
+// wserv wants ecom
+// libwfc wants openenv
+// freetype wants stdlib
+// openenv backend wants esock etc etc
+//
+#include <bafl.iby>
+#include <ecom.iby>
+#include <store.iby>
+#include <stdlib.iby>
+#include <openenv.iby>
+
+#include <c32.iby>
+#include <ecuart.iby>
+#include <irda.iby>
+#include <bluetooth.iby>
+#include <inetprotutil.iby>
+#include <network.iby>
+#include <dial.iby>
+#include <crypto.iby>
+#include <certman.iby>
+#include <logeng.iby>
+#include <filetokens.iby>
+#include <asnpkcs.iby>
+#include <emime.iby>
+#include <scs.iby>
+#include <cflog.iby>
+
+file=\epoc32\release\ARMV5\urel\abclient.dll                           sys\bin\abclient.dll
+file=\epoc32\release\ARMV5\urel\Http.dll                                       sys\bin\http.dll
+file=\epoc32\release\ARMV5\urel\Httputils.dll                          sys\bin\httputils.dll
+file=\epoc32\release\ARMV5\urel\securitymanager.dll            sys\bin\securitymanager.dll
+file=\epoc32\release\ARMV5\urel\ocspsupportclient.dll          sys\bin\ocspsupportclient.dll
+file=\epoc32\release\ARMV5\urel\siscontroller.dll                      sys\bin\siscontroller.dll
+file=\epoc32\release\ARMV5\urel\devinfosupportclient.dll       sys\bin\devinfosupportclient.dll
+file=\epoc32\release\ARMV5\urel\uissclient.dll                                 sys\bin\uissclient.dll
+file=\epoc32\release\ARMV5\urel\devinfosupportcommon.dll       sys\bin\devinfosupportcommon.dll
+file=\epoc32\release\ARMV5\urel\ipcstream.dll                          sys\bin\ipcstream.dll
+//file=\epoc32\release\ARMV5\urel\usbcsc_bil.dll		sys\bin\usbcsc_bil.dll
+file=\epoc32\release\ARMV5\urel\usbdescriptors.dll	sys\bin\usbdescriptors.dll
+file=\epoc32\release\ARMV5\urel\usbhostmsclient.dll	sys\bin\usbhostmsclient.dll
+file=\epoc32\release\ARMV5\urel\usbdi_utils.dll		sys\bin\usbdi_utils.dll
+file=\epoc32\release\ARMV5\urel\iscapi.dll			sys\bin\iscapi.dll
+file=\epoc32\release\ARMV5\urel\isimessage.dll		sys\bin\isimessage.dll
+
+// cenrep file for timezone server database
+data=\epoc32\data\z\private\10202be9\1020383e.txt		private\10202be9\1020383e.txt
+
+#endif /* __MINIGUI_OBY__ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/zoom2/bigrom.oby	Tue May 18 17:16:07 2010 +0100
@@ -0,0 +1,760 @@
+/*
+
+   Big ROM IBY for Symbian^3
+   garethl@symbian.org
+
+*/
+
+#include <RemovableFeatures.iby>
+
+#undef SYMBIAN_EXCLUDE_KEYMAP
+#undef SYMBIAN_EXCLUDE_LOCATION // so that lbs.dll is included
+#undef SYMBIAN_EXCLUDE_SIP // so that sipsw.dll etc are included
+#undef SYMBIAN_EXCLUDE_SCDV // so that SCDV is included
+#undef SYMBIAN_EXCLUDE_BLUETOOTH // so that BT is included
+#undef SYMBIAN_EXCLUDE_MTP
+#undef SYMBIAN_EXCLUDE_OFFLINE_MODE
+#undef SYMBIAN_EXCLUDE_OBEX
+
+
+#define __OMA_SUPL_PLUGINS // for core/mw/omasuplprotocolhandler.iby
+
+
+#define __VIDEOEDITORENGINE_IBY__
+#define __VIDEOEDITORUICOMPONENTS_IBY__
+#define __SIMPLEVIDEOEDITOR_IBY__
+#define __SIMPLECUTVIDEO_IBY__
+#define __VIDEOPROVIDER_IBY__
+
+/* eaacplusaudiocontrollerutility.dll can't be built, so remove whatever uses it */
+#define AUDIOCONTROLLERPLUGINSVARIANT_IBY
+
+#include <variant/s60macros.iby>
+#include <zoom2.oby>
+//                                            which includes <header.iby>
+//                                            which includes <symbian_os_romdefs.hby>
+//                                            which includes <feature.iby>
+//                                            which includes <base.iby>
+//                                            which includes <kernel.hby>
+//                                            which includes <base.iby>
+//                                            which includes <base_zoom2.iby>
+//                                            which includes <compsupp.iby>
+//                                            which includes <rm_debug_svr.iby>
+//#undef SURFACEMANAGER_DRV // because zoom2.oby defines it but doesn't have _zoom2_surfacemanagerdriver.ldd
+//device[VARID]=KERNEL_DIR\BUILD_DIR\pipelib.ldd        \Sys\Bin\pipelib.ldd /* zoom2 base was not including this */
+
+/* Graphics adaptation */
+
+#define SYMBIAN_BUILD_GCE
+#define SYMBIAN_GRAPHICS_USE_GCE // for graphics_adaptation.hby
+#undef SYMBIAN_GRAPHICS_ADAPTATION // allows for setup of SYMBIAN_GRAPHICS_ADAPTATION to SGA_SW
+#define SYMBIAN_GRAPHICS_USE_EGL_REF
+#define SYMBIAN_GRAPHICS_USE_OPENWF
+#define FBSRASTERIZER_DRV <fbsrasterizer_stub.iby>
+//#define GRAPHICSRESOURCE_DRV <graphicsresourceadapter_stub.iby>
+#define OPENWFCLIB_DRV <openwfc_ref.iby>
+
+#undef FF_WLAN_WAPI_INCLUDE_IN_ROM // needed so that wapisecuritysettingsui.iby pulls in a wapuisecuritysettingsui.dll that we have in the build
+
+/* miscallaneous defines */
+
+//#define SYMBIAN_USING_CTSY_DISPATCHER // for ctsy.iby to pull in phonetsy.tsy
+
+//#define OPENGLES_DRV <opengles_sw.iby>
+
+#undef FF_WLAN_WAPI_INCLUDE_IN_ROM // needed so that wapisecuritysettingsui.iby pulls in a wapuisecuritysettingsui.dll that we have in the build
+
+/* miscallaneous defines */
+
+//#define SYMBIAN_USING_CTSY_DISPATCHER // for ctsy.iby to pull in phonetsy.tsy 
+
+//#define OPENGLES_DRV <opengles_sw.iby>
+
+#undef FF_WLAN_WAPI_INCLUDE_IN_ROM // needed so that wapisecuritysettingsui.iby pulls in a wapuisecuritysettingsui.dll that we have in the build
+
+/* miscallaneous defines */
+
+//#define SYMBIAN_USING_CTSY_DISPATCHER // for ctsy.iby to pull in phonetsy.tsy
+
+/* The top-level includes */
+
+
+#include <graphics_adaptation.hby>
+
+
+
+
+#include <3gplibrary.iby>
+//                                            which includes <3gpmp4lib.iby>
+#include <a3fdevsound.iby>
+#include <a3fserverstart.iby>
+
+#include <abtester.oby>
+//                                            which includes <ABTester.iby>
+#include <acf.iby>
+#include <acl.iby>
+#include <activitymanager.iby>
+#include <addressinfohook.iby>
+#include <agentdialog.iby>
+#include <agentpr.iby>
+//                                            which includes <agentprcore.iby>
+#include <agentshellnotifier.iby>
+#include <agnmodel.iby>
+#include <agnversit.iby>
+//                                            which includes <timezoneserver.iby>
+//                                            which includes <BackupRestoreNotification.iby>
+//                                            which includes <swiplugin.iby>
+//                                            which includes <sql.iby>
+//                                            which includes <utrace.iby>
+//                                            which includes <btrace.iby>
+#include <alarmserver.iby>
+//                                            which includes <ssmsus.iby>
+#include <amastart.iby>
+#include <animation.iby>
+#include <aplp.iby>
+#include <apparc.iby>
+#include <asn1export.iby>
+#include <asn1rrlp.iby>
+#include <asn1supl.iby>
+#include <asnpkcs.iby>
+//                                            which includes <pbe.iby>
+//                                            which includes <crypto.iby>
+//                                            which includes <random.iby>
+//                                            which includes <hash.iby>
+//                                            which includes <cryptospi_plugins.iby>
+//                                            which includes <filetokensconfig.iby>
+#include <ASR.iby>
+#include <autotest.iby>
+#include <avi.iby>
+//                                            which includes <subtitledecoder.iby>
+#include <bioclass0smsplugin.iby>
+//                                            which includes <watcher.iby>
+//                                            which includes <flogger.iby>
+//                                            which includes <gtbioutils.iby>
+//                                            which includes <messageserver.iby>
+//                                            which includes <messageserver.hby>
+//                                            which includes <gtsmsmtm.iby>
+//                                            which includes <c32.iby>
+//                                            which includes <usb.iby>
+//                                            which includes <usbman.iby>
+//                                            which includes <c32.iby>
+//                                            which includes <ecom.iby>
+//                                            which includes <ecompatchconstants.hby>
+//                                            which includes <usbmanrsc.iby>
+//                                            which includes <usbmanbin.iby>
+//                                            which includes <esock.iby>
+//                                            which includes <esock_core.iby>
+//                                            which includes <subconparams.iby>
+//                                            which includes <connservparams.iby>
+//                                            which includes <ESockMessages.iby>
+//                                            which includes <esock_params.iby>
+//                                            which includes <esock_api_ext.iby>
+//                                            which includes <commsdataobjects.iby>
+//                                            which includes <commsdataobjectsecom.iby>
+//                                            which includes <serverden.iby>
+//                                            which includes <commsfw.iby>
+//                                            which includes <factories.iby>
+//                                            which includes <meshmachine.iby>
+//                                            which includes <NETMSG.iby>
+//                                            which includes <NetInterfaces.iby>
+//                                            which includes <NETMessages.iby>
+//                                            which includes <NetMeta.iby>
+//                                            which includes <NETSubscribe.iby>
+//                                            which includes <esock.iby>
+//                                            which includes <insock.iby>
+//                                            which includes <esock.iby>
+//                                            which includes <nodemessages.iby>
+//                                            which includes <ResponseMsg.iby>
+//                                            which includes <rootserver.iby>
+//                                            which includes <NETStSrv.iby>
+//                                            which includes <NETSM.iby>
+//                                            which includes <virtualconstructors.iby>
+//                                            which includes <logeng.iby>
+//                                            which includes <dbms.iby>
+//                                            which includes <logeng.hby>
+//                                            which includes <scheduledsending.iby>
+//                                            which includes <schsvr.iby>
+//                                            which includes <sysagent.iby>
+//                                            which includes <cntmodel.iby>
+//                                            which includes <versit.iby>
+//                                            which includes <conarc.iby>
+//                                            which includes <charconv.iby>
+//                                            which includes <cntplsql.iby>
+//                                            which includes <cntmatchlog.iby>
+//                                            which includes <smsstack.iby>
+//                                            which includes <commsdebugutility.iby>
+//                                            which includes <ost.iby>
+//                                            which includes <etel.iby>
+//                                            which includes <commdb.iby>
+//                                            which includes <commsdat.iby>
+//                                            which includes <ShimNotifier.iby>
+//                                            which includes <fax.iby>
+//                                            which includes <etelmm.iby>
+//                                            which includes <gtsmsmtm.hby>
+#include <bionbswatcher.iby>
+#include <bioparsers.iby>
+#include <biowapwatcher.iby>
+#include <bitgdi.iby>
+#include <bitmaptransforms.iby>
+#include <bitmaptransformsplugin.iby>
+//#include <bldinfo.hby>
+#include <bluetooth.iby>
+//                                            which includes <btlogger.iby>
+//                                            which includes <remotecontrol.iby>
+//                                            which includes <tsp.iby>
+//                                            which includes <hci.iby>
+//                                            which includes <hci_framework.iby>
+//                                            which includes <hci_implementation.iby>
+//                                            which includes <corehci_symbian.iby>
+//                                            which includes <commandsevents_symbian.iby>
+//                                            which includes <hci_qdp_symbian.iby>
+//                                            which includes <hctl_bcsp.iby>
+//                                            which includes <initialisor_symbian.iby>
+#include <bmpanim.iby>
+#include <bookmarkdb.iby>
+#include <btpan.iby>
+#include <btsnoophcilogger.iby>
+#include <c32bca.iby>
+#include <c32start.iby>
+#include <caf.iby>
+//                                            which includes <reccafconfig.iby>
+#include <calcon.iby>
+#include <calinterimapi.iby>
+#include <ced.iby>
+//                                            which includes <Xml.iby>
+//                                            which includes <xmlframework.iby>
+//                                            which includes <xmlcustomresolver.iby>
+//                                            which includes <xmlparserplugin.iby>
+//                                            which includes <wbxmlparser.iby>
+//                                            which includes <stdlib.iby>
+#include <ceddump.iby>
+#include <certman.iby>
+//                                            which includes <secutil.iby>
+//                                            which includes <sectcbutil.iby>
+//                                            which includes <ocspconfig.iby>
+#include <cflog.iby>
+#include <cfrtp.iby>
+//                                            which includes <rtpcore.iby>
+#include <charconv_all_plugins.iby>
+//                                            which includes <charconv_chinese_simplfied.iby>
+//                                            which includes <charconv_chinese_traditional.iby>
+//                                            which includes <charconv_japanese.iby>
+//                                            which includes <charconv_japanese_docomo.iby>
+//                                            which includes <charconv_iso8859x.iby>
+//                                            which includes <charconv_codepage.iby>
+//                                            which includes <charconv_sms7bit.iby>
+//                                            which includes <charconv_gsm7_turkish.iby>
+//                                            which includes <charconv_spanish_smsencoding.iby>
+//                                            which includes <charconv_portuguese_smsencoding.iby>
+//                                            which includes <charconv_s60.iby>
+//**#include <charconv_gsm7_turkish_Variant.iby>
+
+#include <charconv_japanese_kddiau.iby>
+#include <charconv_japanese_s60.iby>
+#include <chtmltocrtconverter.iby>
+//**#include <cinidata.iby>
+#include <cmncustomcmds.iby>
+#include <commonengine.iby>
+#include <commonengineresources.iby>
+#include <commsbufs.iby>
+#include <commsbufskern.iby>
+#include <commslog.iby>
+//                                            which includes <commsrootserver.iby>
+#include <conditionevaluator.iby>
+#include <cone.iby>
+//**#include <connect-gt.iby>
+#include <connectivity_securebackupengine.iby>
+#include <coredumpscriptconfig.iby>
+#include <coredumpserver.iby>
+#include <coredumpserverstub.iby>
+#include <coredumpui.iby>
+#include <coreproviders.iby>
+#include <coreprovidersecom.iby>
+#include <csc_plugin.iby>
+
+#include <ctsy.iby> // builds in phonetsy.tsy which relies on licenseetsy.dll 
+//                                            which includes <ctsysystemstateplugin.iby>
+//#include <customcmds.iby>
+#include <DEBUG.iby>
+#include <devsoundadaptationinfo.iby>
+#include <devsound_pluginsupport.iby>
+//#include <devsound_refplugin.iby> // clashes with core/mw/mmfaudioconnectioncontroller.iby
+#include <DevVideo.iby>
+#include <dexcformatter.iby>
+
+#include <dial.iby>
+#include <directgdi.iby>
+//                                            which includes <graphicsresource.iby>
+//                                            which includes <graphicsresourceadapter.iby>
+//                                            which includes <graphicsresourceadapter_sw.iby>
+//                                            which includes <surfacemanager.iby>
+//                                            which includes <surfacemanager_omap.iby>
+//                                            which includes <directgdiadapter.iby>
+//                                            which includes <directgdiadapter_sw.iby>
+//#include <directgdiadapter_vg.iby>
+//                                            which includes <openvg.iby>
+//                                            which includes <openvg_sw.iby>
+#include <dnd.iby>
+#include <dnsproxy.iby>
+#include <dnsproxyupdateif.iby>
+#include <dptestcons.oby>
+#include <ecam.iby>
+//                                            which includes <ecam_stubplugin.iby>
+//#include <econs_wserv.iby>
+#include <ecuart.iby>
+//#include <egl.iby>
+//                                            which includes <egl_ref.iby>
+#include <egul.iby>
+#include <elements.iby>
+//                                            which includes <NodeMessages.iby>
+//                                            which includes <MeshMachine.iby>
+#include <emime.iby>
+#include <eon_font.iby>
+#include <epos_omasuplposmessageplugin.iby>
+#include <epos_omasuplposmsgpluginimpl.iby>
+#include <ESHELL.iby>
+#include <esockmessageintercept.iby>
+
+#include <etelisv.iby>
+#include <etelpckt.iby>
+#include <etelsat.iby>
+
+#include <ether802.iby>
+#include <euserhl.iby>
+#include <exifutility.iby>
+#include <ezlib.iby>
+//                                            which includes <openenv.iby>
+//                                            which includes <timezonelocalization.iby>
+//                                            which includes <TimeZoneServer.iby>
+//                                            which includes <stdcpp.iby>
+//                                            which includes <oelibrt.iby>
+//                                            which includes <openenv.iby>
+#include <fatcharsetconv.iby>
+#include <fbserv.iby>
+//                                            which includes <fbsrasterizer_stub.iby>
+#include <fdf.iby>
+#include <featmgr.iby>
+#include <featreg.iby>
+#include <fepbase.iby>
+#include <filetokens.iby>
+#include <filewriter.iby>
+#include <fmtx_hwrm.iby>
+#include <fntstore.iby>
+
+#include <freetype.iby>
+//                                            which includes <freetype.hby>
+#include <ftp_e.iby>
+#include <gdi.iby>
+//                                            which includes <palette.iby>
+#include <genericscprparams.iby>
+#include <gfxtranseffect.iby>
+#include <gifscaler.iby>
+#include <gmxml.iby>
+#include <gpssetclock.iby>
+//#include <graphicsresourceadapter_mbx.iby>
+//#include <graphicsresourceadapter_sgx.iby>
+#include <gtbioengmtm.iby>
+#include <gtbiomessaging.iby>
+//#include <gtemailmtm.hby>
+
+#include <gtmessaging.iby>
+//                                            which includes <sendas2.iby>
+//                                            which includes <gtmtur.iby>
+//                                            which includes <msgurlhandler.iby>
+#include <guqos.iby>
+#include <hciproxy.iby>
+#include <hci_initialisor_ti.iby>
+#include <hctl_ti.iby>
+#include <hctl_uart_original.iby>
+
+#include <hlpmodel.iby>
+#include <http.iby>
+//                                            which includes <httpcore.iby>
+//                                            which includes <InetProtUtil.iby>
+//                                            which includes <GtEmailMtm.iby>
+//                                            which includes <transporthandler.iby>
+#include <hwresourcemanager.iby>
+#include <hwrmuiplugin.iby>
+#include <iclcodecs.iby>
+//                                            which includes <JpegYuvDecoder.iby>
+
+#include <iculayoutengine.iby>
+#include <imageconversion.iby>
+#include <imagedisplay.iby>
+//                                            which includes <MngImageDisplay.iby>
+//                                            which includes <IclWrapperImageDisplay.iby>
+#include <imageprocessor.iby>
+#include <imagetransform.iby>
+
+#include <ineturilist.iby>
+#include <iniparser.iby>
+
+//#include <integrationtest.iby> // integrationtest.dll is not getting built
+//                                            which includes <testexecute.iby>
+//                                            which includes <testexecutelogger.iby>
+//                                            which includes <RFilelogger.iby>
+#include <ipaddrinfoparams.iby>
+#include <ipeventfactory.iby>
+#include <ipeventnotifier.iby>
+//                                            which includes <ipeventtypes.iby>
+//                                            which includes <netmeta.iby>
+//                                            which includes <netsubscribe.iby>
+//                                            which includes <netmeta.iby>
+#include <ipproto.iby>
+#include <ipsec.iby>
+//                                            which includes <ipsec6.iby>
+//                                            which includes <ipseccrypto.iby>
+#include <iptransport.iby>
+//                                            which includes <mobilitycoreproviders.iby>
+//**#include <ipupsdialog.iby>
+#include <irda.iby>
+//                                            which includes <obexprotocol.iby>
+
+
+#include <kerneltrace.oby>
+#include <lafshutdowneventobserveradaptor.iby>
+#include <lbs.iby>
+#include <lbsadatacache.iby>
+#include <lbsadmin.iby>
+//                                            which includes <lbsassistancedata.iby>
+//                                            which includes <lbslocmonclient.iby>
+//                                            which includes <lbsloccommon.iby>
+//                                            which includes <LbsLocDataSource.iby>
+//                                            which includes <lbsinternalapi.iby>
+//                                            which includes <lbsnetprotocol.iby>
+//                                            which includes <lbspartnercommon.iby>
+//                                            which includes <lbsnetinternalapi.iby>
+//                                            which includes <lbsagpsngmsgs.iby>
+//                                            which includes <lbscommoninternaldatatypes.iby>
+//                                            which includes <lbsnetregstatusint.iby>
+//                                            which includes <lbsngnlmint.iby>
+//                                            which includes <lbsnrhngmsgs.iby>
+//                                            which includes <lbsreffnpint.iby>
+//                                            which includes <lbssymmetryint.iby>
+//                                            which includes <lbsroot.iby>
+//                                            which includes <lbsrootapi.iby>
+//                                            which includes <lbsloggerapi.iby>
+//                                            which includes <lbsdebug.iby>
+//                                            which includes <lbslocsettings.iby>
+//                                            which includes <lbslocindicatorlib.iby>
+//                                            which includes <lbsmlfwutils.iby>
+#include <lbsagpslocmanager.iby>
+#include <lbsbtgpspsy.iby>
+#include <lbsdefaultpsy.iby>
+#include <lbsgpsagpspsy.iby>
+#include <lbslocationmonitor.iby>
+
+#include <lbslocserver.iby>
+//                                            which includes <lbslocutils.iby>
+//                                            which includes <lbsqualityprofileapi.iby>
+#include <lbsnetgateway.iby>
+#include <lbsnetpsy.iby>
+#include <lbsnetsim.iby>
+#include <lbsnetworklocationmanager.iby>
+#include <lbsnetworkprivacy.iby>
+#include <lbsnetworkrequesthandler.iby>
+//                                            which includes <lbsx3p.iby>
+//                                            which includes <lbsprivacycontroller.iby>
+//                                            which includes <lbsprivacyexnotifiers.iby>
+//                                            which includes <lbsprivacydatatypes.iby>
+//                                            which includes <lbsqueryandnotification.iby>
+#include <lbsnetworktest.iby>
+//                                            which includes <lbsprotocolmodule.iby>
+//                                            which includes <suplasn1.iby>
+//                                            which includes <lbssupltestmodule.iby>
+#include <lbspospluginfw.iby>
+#include <lbsprivacyprotocolmodule.iby>
+#include <lbsprivacyrequest.iby>
+#include <lbspsytester.iby>
+#include <lbssimulationpsy.iby>
+#include <lbssuplsmstrigger.iby>
+#include <lbssuplwappush.iby>
+#include <lbs_privacyprotocolmodule.iby>
+#include <loadlafshutdown.iby>
+#include <loopback.iby>
+#include <mbmsparams.iby>
+#include <mdf.iby>
+#include <MESON.iby>
+//                                            which includes <Store.iby>
+//                                            which includes <EText.iby>
+//                                            which includes <Form.iby>
+//                                            which includes <print.iby>
+//                                            which includes <PwrCli.iby>
+//                                            which includes <Bafl.iby>
+//                                            which includes <NumberConversion.iby>
+#include <MESON.iby>
+#include <Midi.iby>
+#include <milif.iby>
+#include <miscpushutils.iby>
+#include <mmcommon.iby>
+#include <mmf.iby>
+//                                            which includes <mmfEffect.iby>
+//                                            which includes <MmfDrmPlugin.iby>
+//                                            which includes <mmf_plugin.iby>
+
+#include <mmssettings.iby>
+#include <mmtsy.iby>
+
+#include <msfdc.iby>
+//**#include <mtp_backupnrestoredp.iby>
+//                                            which includes <mtp_framework.iby>
+//                                            which includes <mtp_devicedp.iby>
+#include <mtp_filedp.iby>
+#include <mtp_ptpip.iby>
+#include <mtp_usbsic.iby>
+#include <multipartparser.iby>
+#include <napt.iby>
+
+#include <netcfgextnmip.iby>
+//                                            which includes <netstsrv.iby>
+//                                            which includes <NetCfgExtnBase.iby>
+//                                            which includes <netstsrv.iby>
+
+#include <netups.iby>
+//                                            which includes <ups.iby>
+//                                            which includes <ups_config.iby>
+#include <network.iby>
+//                                            which includes <simpleselectorbase.iby>
+//                                            which includes <upscoreproviders.iby>
+//                                            which includes <tls.iby>
+//                                            which includes <ocsp.iby>
+//                                            which includes <tlsprovider.iby>
+//                                            which includes <tlsproviderconfig.iby>
+//                                            which includes <CSD.IBY>
+//                                            which includes <psdagt.iby>
+//                                            which includes <nullagt.iby>
+//                                            which includes <ppp.iby>
+//                                            which includes <PREDCOMP.IBY>
+//                                            which includes <rawipnif.iby>
+//                                            which includes <packetlogger.iby>
+//                                            which includes <rawipnif.iby>
+//                                            which includes <DHCPServ.iby>
+//                                            which includes <umtsif.iby>
+//                                            which includes <pfqoslib.iby>
+//                                            which includes <qos.iby>
+//                                            which includes <qoslib.iby>
+//                                            which includes <qosextnapi.iby>
+//                                            which includes <qos3gpp.iby>
+//                                            which includes <pdp.iby>
+//                                            which includes <QosIPSCPR.iby>
+//                                            which includes <networking_dnsproxy.iby>
+
+//**#include <ntras-plugin.iby>
+
+#include <nvgrenderstage.iby>
+#include <obex.iby>
+#include <OBEYFILE.iby>
+// #include <oggvorbis.iby> // relies on oggvorbisint/floatutil.dll, but our source only builds .libs
+#include <omxilcomp.iby>
+#include <omxilcompref.iby>
+#include <omxilcore.iby>
+#include <opengles.iby>
+//                                            which includes <opengles_sw.iby>
+//#include <openwfc_ref.iby>
+//                                            which includes <openwfc_support.iby>
+#include <pagedrom.oby>
+#include <pagedrom_functional.oby>
+#include <pagedrom_stressed.oby>
+#include <panorama.iby>
+#include <pbap.iby>
+#include <pdrstore.iby>
+#include <phbksync.iby>
+#include <pkcs12.iby>
+#include <pkcs7.iby>
+#include <PlatSec.oby>
+#include <PlatSecDiagnostics.oby>
+#include <PlatSecEnforcement.oby>
+//**#include <plpremotelink.iby>
+//                                            which includes <plpvariant.iby>
+
+#include <printers.iby>
+#include <punycodeconverter.iby>
+
+#include <recognisers.iby>
+#include <refacladaptation.iby>
+#include <refmmrc.iby>
+
+//**#include <rfs_variant.iby>
+#include <richtexttohtmlconv.iby>
+#include <rohandler.iby>
+#include <rpnp.iby>
+//**#include <rta.iby>
+#include <rtp.iby>
+//                                            which includes <shimrtp.iby>
+//**#include <rtpamr.iby>
+//**#include <S60CenRep_variant.iby>
+//#include <S60Macros.iby>
+#include <scs.iby>
+#include <securitycommonutils.iby>
+#include <security_ups_utils.iby>
+#include <setcap.iby>
+#include <sfopenvg.iby>
+
+#include <shma.iby>
+#include <sipdummyprt.iby>
+#include <siph2lanbearermonitor.iby>
+#include <sipproviders.iby>
+#include <sipstatemachine.iby>
+#include <sipsw.iby>
+//#include <sislwappush.iby> // mutually exclusive with S60SislWapPush
+#include <sqlite3.iby>
+#include <ssma.iby>
+//                                            which includes <ssmcmn.iby>
+//                                            which includes <ssmcmd.iby>
+//                                            which includes <ssmserver.iby>
+//                                            which includes <ssmss.iby>
+//                                            which includes <ssmdomainpolicy.iby>
+//#include <ssmclayer.iby>
+//#include <ssplugins.iby>
+//                                            which includes <sspluginsadaptation.iby>
+//                                            which includes <sspluginsgsa.iby>
+#include <stat.iby>
+//                                            which includes <statcommon.iby>
+
+#include <subtitle.iby>
+//#include <surfacemanager_ref.iby>
+#include <surfaceupdate.iby>
+//                                            which includes <surfaceupdate_ref.iby>
+#include <swi.iby>
+//                                            which includes <swiconfig.iby>
+#include <symbianelfformatter.iby>
+
+#include <sysawatcher.iby>
+//                                            which includes <telwatcher.iby>
+#include <sysstart.iby>
+#include <sysstartconfig.iby>
+#include <tefcleanup.iby>
+#include <tefutilityserver.iby>
+#include <telephony.iby>
+#include <telnetd.iby>
+#include <telnet_e.iby>
+#include <testbed.iby>
+#include <testexecutepipslogger.iby>
+#include <testexecutepipsloggerclient.iby>
+//#include <testlocale.iby> // clashes with language\mw\elocl.iby
+#include <tiger.iby>
+#include <traces.iby>
+#include <tzlocalizationrscfactory.iby>
+#include <ucc.iby>
+#include <uikon.iby>
+//                                            which includes <uiklaf.iby>
+#include <ulogger.iby>
+#include <uloggerclttool.iby>
+// #include <usbhostmsmm.iby> // need to find how to build this
+#include <Version_Variant.iby>
+#include <versitrecognizer.iby>
+#include <videorenderer.iby>
+
+#include <wapurilookup.iby>
+#include <wfcinterop_tests.iby>
+#include <wrapperutilsplugin.iby>
+//#undef SYMBIAN_GRAPHICS_USE_GCE // for graphics_adaptation.hby
+#include <wserv.iby>
+//                                            which includes <wserv_std_plugins.iby>
+//                                            which includes <openwfc.iby>
+//#define SYMBIAN_GRAPHICS_USE_GCE // for graphics_adaptation.hby
+
+#include <wslog.iby>
+
+#include <xmlengine.iby>
+#include <xmlenginedom.iby>
+//                                            which includes <xmlengineutils.iby>
+#include <xmlenginesaxplugin.iby>
+#include <xmlengineserializer.iby>
+#include <zsh.iby>
+
+
+// manually copied into place
+#include <fontutils.iby>
+
+#include <core\stubs\srsfenginestub.iby> // exported when this module is correctly built
+
+
+// IBY files to not include.
+// This is achieved by defining the IBY's gating define.
+//
+
+#define FBSRASTERIZER_IBY // to stop core/mw/fbsrasterizer.iby getting included 
+//#define __NETWORKING_TEST_IBY__ // don't pull in networktest.iby
+//#define __BASE_SYBORG_IBY__ // we are using Zoom2
+//#define SWITEXTSHELL // switextshell.iby
+
+// fixups
+
+//file=ABI_DIR\BUILD_DIR\vimpstsettings.dll				SHARED_LIB_DIR\vimpstsettings.dll
+
+file=ABI_DIR\BUILD_DIR\LICENSEETSY_STUB.DLL        Sys\Bin\licenseetsy.dll /* needed by phonetsy.tsy */
+file=ABI_DIR\BUILD_DIR\SIMATKTSY_STUB.DLL        Sys\Bin\simatktsy.dll /* needed by licenseetsy_stub.dll */
+//file=ABI_DIR\BUILD_DIR\usbcsc.ldd        SHARED_LIB_DIR\usbcsc.ldd /* needed by msfs_db.fsy */
+
+//extension[VARID]=KERNEL_DIR\BUILD_DIR\display.ldd        \Sys\Bin\display0.ldd /* needed for the graphics composition */
+
+
+file=ABI_DIR\BUILD_DIR\tvoutconfig.dll        Sys\Bin\tvoutconfig.dll /* can't find a .iby that includes this */
+file=ABI_DIR\BUILD_DIR\ddc_access.dll        Sys\Bin\ddc_access.dll /* can't find a .iby that includes this */
+file=ABI_DIR\BUILD_DIR\power_save_display_mode_stub.dll        Sys\Bin\power_save_display_mode.dll /* can't find a .iby that includes this */
+file=ABI_DIR\BUILD_DIR\usbcsc_bil.dll        Sys\Bin\usbcsc_bil.dll /* can't find a .iby that includes this */
+file=ABI_DIR\BUILD_DIR\fmradiotunercontrol.dll        Sys\Bin\fmradiotunercontrol.dll /* can't find a .iby that includes this */
+file=ABI_DIR\BUILD_DIR\usbclasscontroller.dll        Sys\Bin\usbclasscontroller.dll /* added normally via usbmanbin.iby */
+
+file=ABI_DIR\BUILD_DIR\cnvshiftjisdirectmap.dll        Sys\Bin\cnvshiftjisdirectmap.dll /* comes from the Japanese charconv IBYs */
+
+file=ABI_DIR\BUILD_DIR\libegl_sw.dll        Sys\Bin\libegl_sw.dll /* */
+file=ABI_DIR\BUILD_DIR\libopenvg_sw.dll        Sys\Bin\libopenvg_sw.dll /* */
+file=ABI_DIR\BUILD_DIR\libopenvgu_sw.dll        Sys\Bin\libopenvgu_sw.dll /* */
+file=ABI_DIR\BUILD_DIR\libgles_cm.dll        Sys\Bin\libgles_cm.dll /* */
+file=ABI_DIR\BUILD_DIR\libglesv1_cm.dll        Sys\Bin\libglesv1_cm.dll /* */
+
+
+//file=ABI_DIR\BUILD_DIR\atextclient.dll        Sys\Bin\atextclient.dll /*required for dunatext.dll, but not referenced by an IBY file I could see */
+//file=ABI_DIR\BUILD_DIR\atextcommon.dll        Sys\Bin\atextcommon.dll /*required for dunatext.dll, but not referenced by an IBY file I could see */
+//file=ABI_DIR\BUILD_DIR\asrsttshwdevice_stub.dll        Sys\Bin\asrsttshwdevice.dll /*required for nss* */
+//file=ABI_DIR\BUILD_DIR\atextcommon.dll        Sys\Bin\atextcommon.dll /*required for dunatext.dll, but not referenced by an IBY file I could see */
+#ifdef _FULL_DEBUG
+file=ABI_DIR\BUILD_DIR\mullogging.dll        Sys\Bin\mullogging.dll /* needs forcing in for the debug build */
+#endif
+
+
+
+
+file=\epoc32\release\armv5\urel\elocl.01 	"sys\bin\elocl.01"
+file=\epoc32\release\armv5\urel\elocl.37 	"sys\bin\elocl.37"
+file=\epoc32\release\armv5\urel\elocl.42 	"sys\bin\elocl.42"
+file=\epoc32\release\armv5\urel\elocl.25 	"sys\bin\elocl.25"
+file=\epoc32\release\armv5\urel\elocl.07 	"sys\bin\elocl.07"
+file=\epoc32\release\armv5\urel\elocl.03 	"sys\bin\elocl.03"
+file=\epoc32\release\armv5\urel\elocl.54 	"sys\bin\elocl.54"
+file=\epoc32\release\armv5\urel\elocl.10 	"sys\bin\elocl.10"
+file=\epoc32\release\armv5\urel\elocl.04 	"sys\bin\elocl.04"
+file=\epoc32\release\armv5\urel\elocl.49 	"sys\bin\elocl.49"
+file=\epoc32\release\armv5\urel\elocl.09 	"sys\bin\elocl.09"
+file=\epoc32\release\armv5\urel\elocl.51 	"sys\bin\elocl.51"
+file=\epoc32\release\armv5\urel\elocl.02 	"sys\bin\elocl.02"
+file=\epoc32\release\armv5\urel\elocl.57 	"sys\bin\elocl.57"
+file=\epoc32\release\armv5\urel\elocl.45 	"sys\bin\elocl.45"
+file=\epoc32\release\armv5\urel\elocl.17 	"sys\bin\elocl.17"
+file=\epoc32\release\armv5\urel\elocl.59 	"sys\bin\elocl.59"
+file=\epoc32\release\armv5\urel\elocl.15 	"sys\bin\elocl.15"
+file=\epoc32\release\armv5\urel\elocl.05 	"sys\bin\elocl.05"
+file=\epoc32\release\armv5\urel\elocl.32 	"sys\bin\elocl.32"
+file=\epoc32\release\armv5\urel\elocl.68 	"sys\bin\elocl.68"
+file=\epoc32\release\armv5\urel\elocl.67 	"sys\bin\elocl.67"
+file=\epoc32\release\armv5\urel\elocl.70 	"sys\bin\elocl.70"
+file=\epoc32\release\armv5\urel\elocl.18 	"sys\bin\elocl.18"
+file=\epoc32\release\armv5\urel\elocl.08 	"sys\bin\elocl.08"
+file=\epoc32\release\armv5\urel\elocl.27 	"sys\bin\elocl.27"
+file=\epoc32\release\armv5\urel\elocl.76 	"sys\bin\elocl.76"
+file=\epoc32\release\armv5\urel\elocl.13 	"sys\bin\elocl.13"
+file=\epoc32\release\armv5\urel\elocl.78 	"sys\bin\elocl.78"
+file=\epoc32\release\armv5\urel\elocl.16 	"sys\bin\elocl.16"
+file=\epoc32\release\armv5\urel\elocl.26 	"sys\bin\elocl.26"
+file=\epoc32\release\armv5\urel\elocl.28 	"sys\bin\elocl.28"
+file=\epoc32\release\armv5\urel\elocl.79 	"sys\bin\elocl.79"
+file=\epoc32\release\armv5\urel\elocl.06 	"sys\bin\elocl.06"
+file=\epoc32\release\armv5\urel\elocl.33 	"sys\bin\elocl.33"
+file=\epoc32\release\armv5\urel\elocl.39 	"sys\bin\elocl.39"
+file=\epoc32\release\armv5\urel\elocl.14 	"sys\bin\elocl.14"
+file=\epoc32\release\armv5\urel\elocl.93 	"sys\bin\elocl.93"
+file=\epoc32\release\armv5\urel\elocl.96 	"sys\bin\elocl.96"
+file=\epoc32\release\armv5\urel\elocl.31 	"sys\bin\elocl.31"
+file=\epoc32\release\armv5\urel\elocl.30 	"sys\bin\elocl.30"
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/zoom2/group/bld.inf	Tue May 18 17:16:07 2010 +0100
@@ -0,0 +1,22 @@
+/*
+* Copyright (c) 2010 Symbian Foundation Ltd
+* 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:
+* Symbian Foundation Ltd - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+PRJ_PLATFORMS
+ARMV5
+
+PRJ_EXPORTS
+../bigrom.oby                 /epoc32/rom/config/zoom2/
+../image_conf_zoom2.mk        /epoc32/rom/config/zoom2/
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/zoom2/image_conf_zoom2.mk	Tue May 18 17:16:07 2010 +0100
@@ -0,0 +1,32 @@
+# needs override.pm in \epoc32\tools\
+# needs s60ibymacros.pm, plugincommon.pm obyparse.pm rom\include\symbian_os_romdefs.hby rom\variant\s60macros.iby tools\localise.pm, localise_all_resources.pm
+
+PRODUCT_NAME =zoom2
+PLATFORM_NAME =zoom2
+BUILD =armv5
+ROMMEGS =71
+ROMDATE =abcd 
+USE_FLOAT =0
+USE_VERGEN =1
+USE_ROFS =0
+USE_PAGING =0
+USE_PLATSEC =0
+USE_ROMFILE =1
+COREPLAT_OPT =
+CORE_OBY     = $(E32ROM)/config/zoom2/bigrom.oby $(CORE_PREFIX)_core_generated.oby
+
+CORE_OBYGEN =\
+  geniby | $(CORE_PREFIX)_core_generated.oby |\
+    $(E32ROMINC)/core/app \
+	$(E32ROMINC)/core/mw \
+	$(E32ROMINC)/core/os \
+	$(E32ROMINC)/core/stubs \
+   $(call select,$(TYPE),prd,,$(E32ROMINC)/core/tools) | *.iby | \#include "%3" | end
+
+CORE_OPT = -keepgoing $(BLDROM_OPT) -D_EABI=$(ARM_VERSION) -D$(call ucase,$(PRODUCT_NAME)) -I\epoc32\rom\include\core\mw -I\epoc32\rom\include\core\app -I\epoc32\rom\include\core\os -es60ibymacros -elocalise -D_FULL_DEBUG
+#	$(E32ROMINC)/language/app \
+#	$(E32ROMINC)/language/mw \
+#	$(E32ROMINC)/language/os \
+#	$(E32ROMINC)/customer/app \
+#	$(E32ROMINC)/customer/mw \
+#	$(E32ROMINC)/customer/os \
--- a/symbianosbld/cedarutils/inc/Symbian_OS_tb92sf.hrh	Tue May 11 17:20:40 2010 +0300
+++ b/symbianosbld/cedarutils/inc/Symbian_OS_tb92sf.hrh	Tue May 18 17:16:07 2010 +0100
@@ -2078,4 +2078,10 @@
 If SYMBIAN_GRAPHICS_FIXNATIVEORIENTATION is enabled, the Orientation Independent Windows feature is enabled.
 */
 #define SYMBIAN_GRAPHICS_FIXNATIVEORIENTATION
-
+/**
+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
+