Revision: 201027
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Tue, 06 Jul 2010 15:39:37 +0300
changeset 86 11a9e5dabbaf
parent 85 9822a3a19959
child 89 b6f79e39a4e0
child 106 3c5fc673b201
Revision: 201027 Kit: 2010127
foundation_system/sf_config/CI_external/customisation/CustomisationInterface/confml/CI_securityconfig.confml
foundation_system/sf_config/CI_external/customisation/CustomisationInterface/confml/CI_telephonyservices.confml
foundation_system/sf_config/CI_external/customisation/CustomisationInterface/confml/CI_videoplayerservicelist.confml
foundation_system/sf_config/CI_external/customisation/CustomisationInterface/confml/ci_s60telephony.confml
foundation_system/sf_config/CI_external/customisation/CustomisationInterface/root.confml
foundation_system/sf_config/CI_external/group/bld.inf
layers.sysdef.xml
Binary file foundation_system/sf_config/CI_external/customisation/CustomisationInterface/confml/CI_securityconfig.confml has changed
Binary file foundation_system/sf_config/CI_external/customisation/CustomisationInterface/confml/CI_telephonyservices.confml has changed
Binary file foundation_system/sf_config/CI_external/customisation/CustomisationInterface/confml/CI_videoplayerservicelist.confml has changed
Binary file foundation_system/sf_config/CI_external/customisation/CustomisationInterface/confml/ci_s60telephony.confml has changed
--- a/foundation_system/sf_config/CI_external/customisation/CustomisationInterface/root.confml	Wed Jun 23 19:35:00 2010 +0300
+++ b/foundation_system/sf_config/CI_external/customisation/CustomisationInterface/root.confml	Tue Jul 06 15:39:37 2010 +0300
@@ -14,4 +14,6 @@
 	<xi:include href="confml/CI_camerax.confml"/>	
 	<xi:include href="confml/CI_emailwizard.confml"/>
 	<xi:include href="confml/CI_suplsettings_productconfig.confml"/>		
+	<xi:include href="confml/CI_securityconfig.confml"/>
+	<xi:include href="confml/CI_videoplayerservicelist.confml"/>
 </configuration>
--- a/foundation_system/sf_config/CI_external/group/bld.inf	Wed Jun 23 19:35:00 2010 +0300
+++ b/foundation_system/sf_config/CI_external/group/bld.inf	Tue Jul 06 15:39:37 2010 +0300
@@ -43,8 +43,12 @@
 ../customisation/CustomisationInterface/confml/CI_numbergrouping.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CI_numbergrouping.confml
 ../customisation/CustomisationInterface/confml/CI_pdpcontextmanager2.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CI_pdpcontextmanager2.confml
 ../customisation/CustomisationInterface/confml/CI_s60provisioning.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CI_s60provisioning.confml
+../customisation/CustomisationInterface/confml/ci_s60telephony.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/ci_s60telephony.confml
+../customisation/CustomisationInterface/confml/CI_securityconfig.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CI_securityconfig.confml
 ../customisation/CustomisationInterface/confml/CI_startup.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CI_startup.confml
 ../customisation/CustomisationInterface/confml/CI_suplsettings_productconfig.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CI_suplsettings_productconfig.confml
+../customisation/CustomisationInterface/confml/CI_telephonyservices.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CI_telephonyservices.confml
+../customisation/CustomisationInterface/confml/CI_videoplayerservicelist.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CI_videoplayerservicelist.confml
 ../customisation/Views/Features/root.confml /epoc32/rom/config/customisation/Views/Features/root.confml
 
 
--- a/layers.sysdef.xml	Wed Jun 23 19:35:00 2010 +0300
+++ b/layers.sysdef.xml	Tue Jul 06 15:39:37 2010 +0300
@@ -23,13 +23,11 @@
 					<unit unitID="symbian.openvg11" name="sf_openvg11" bldFile="sf/os/graphics/openvg/openvginterface/group/openvg11" mrp="" filter="sf_build"/>
 				</component>
 			</module>
-  	</layer>
-    <layer name="app_layer">
       <module name="CI_external">
         <unit unitID="tools.CI_external" mrp="" bldFile="&layer_real_source_path;/foundation_system/sf_config/CI_external/group" name="CI_external" />
       </module>
-    </layer>
-    
+  	</layer>
+   
     <!-- from buildplatform, this is needed for winscw emulator -->
     <layer name="stubs_layer">
 			<module name="sf_licenseetsystub">