FCL/sftools/fbf/projects/platforms: comparison symbian4/single/sysdefs/system

equal deleted inserted replaced

-:ce8543a6aaaa
+:79fffd551b70
 priority CDATA #IMPLIED
 >
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^4">
 <systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
+<layer name="adapt" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" span="2" levels="adaptation plugin mid engine" long-name="Stubs">
+<block name="stubs" level="high" span="2" levels="adapt plugin mid engine" long-name="Stubs">
-<collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
+<collection name="audiostubs" long-name="Audio Stubs" level="adapt">
 <component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs" purpose="optional">
-<unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
+<unit bldFile="adapt/stubs/audiostubs/devsoundextensions_stubs/group"/>
 </component>
 <component name="fmradiotunercontrolstub" long-name="FM Radio Tuner Control Stub" purpose="optional">
-<unit bldFile="adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
+<unit bldFile="adapt/stubs/audiostubs/fmradiotunercontrolstub/group"/>
 </component>
 </collection>
 <collection name="drm_stubs" long-name="DRM Stubs" level="plugin">
 <component name="drm_stubs_build" long-name="DRM Stubs Build" purpose="optional">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
+<unit bldFile="adapt/stubs/drm_stubs/group"/>
 </component>
 </collection>
 <collection name="ocrsrv_stub" long-name="OCR Services Stub" level="mid">
 <component name="ocrsrv_stub_build" long-name="OCR Services Stub Build" filter="!dfs_build" purpose="optional">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
+<unit bldFile="adapt/stubs/ocrsrv_stub/group"/>
 </component>
 </collection>
 <collection name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
 <component name="omasuplasnconverterstubimpl_build" long-name="OMA SUPL ASN Converter Stub Implementation Build" filter="!dfs_build" purpose="optional">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+<unit bldFile="adapt/stubs/omasuplasnconverterstubimpl/group"/>
 </component>
 </collection>
 <collection name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" level="plugin">
 <component name="posmsgpluginreferenceimpl_build" long-name="POS Message Plugin Reference Implementation Build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+<unit bldFile="adapt/stubs/posmsgpluginreferenceimpl/group"/>
 </component>
 </collection>
 <collection name="srsfenginestub" long-name="SRSF Engine Stub" level="engine">
 <component name="srsfenginestub_build" long-name="SRSF Engine Stub Build" filter="stubs" purpose="optional">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
+<unit bldFile="adapt/stubs/srsfenginestub/group"/>
 </component>
 </collection>
 <collection name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub" level="plugin">
 <component name="power_save_display_mode_stub_build" long-name="Power Save Display Mode Stub Build" purpose="optional">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
+<unit bldFile="adapt/stubs/power_save_display_mode_stub/group"/>
 </component>
 </collection>
-<collection name="systemswstubs" long-name="System Software Stubs" level="adaptation">
+<collection name="systemswstubs" long-name="System Software Stubs" level="adapt">
 <component name="ddcaccessstub" long-name="DDC Access Stub" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/ddcaccessstub/group"/>
+<unit bldFile="adapt/stubs/systemswstubs/ddcaccessstub/group"/>
 </component>
 <component name="tvoutconfig" long-name="TV Out Config" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
 </component>
 <component name="accessorypolicyreference" long-name="Accessory Policy Reference" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
 </component>
 <component name="asyreference" long-name="ASY Reference" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
 </component>
 <component name="examplecommonisc" long-name="Example Common ISC" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
 </component>
 <component name="exampledsy" long-name="Example DSY" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
 </component>
 <component name="featuremanagerstub" long-name="Feature Manager Stub" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
 </component>
 <component name="hwrmstubplugins" long-name="Hardware Resource Manager Stub Plugins" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
 </component>
 <component name="hwrmhapticsstubplugin" long-name="Hardware Resource Manager Haptics Stub Plugin" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
 </component>
 <component name="sensorchannelsreference" long-name="Sensor Channels Reference" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
 </component>
 <component name="ssyreference" long-name="SSY Reference" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
 </component>
-<component name="startupadaptationstub" long-name="Startup Adaptation Stub" purpose="optional" plugin="Y">
+<component name="startupadaptstub" long-name="Startup Adaptation Stub" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/startupadaptstub/group" filter="oem_build"/>
 </component>
 <component name="tiltcompensationstub" long-name="Tilt Compensation Stub" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
 </component>
 <component name="tvoutbehaviour" long-name="TV Out Behaviour" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
 </component>
 <component name="wiredbearerreference" long-name="Wired Bearer Reference" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
 </component>
 </collection>
 <collection name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" level="engine">
 <component name="tactileclickplugin_stub_build" long-name="Tactile Click Plugin Stub Build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
+<unit bldFile="adapt/stubs/tactileclickplugin_stub/group"/>
 </component>
 </collection>
 <collection name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub" level="mid">
 <component name="wlanhwinit_stub_build" long-name="WLAN Hardware Init Stub Build" purpose="optional">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
+<unit bldFile="adapt/stubs/wlanhwinit_stub/group"/>
 </component>
 </collection>
 </block>
 <block name="beagleboard" level="low" levels="hw-if" long-name="Beagle Board">
 <collection name="omap3530" long-name="OMAP 3530" level="hw-if">
 <component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
+<unit bldFile="adapt/beagleboard/omap3530" mrp="adapt/beagleboard/omap3530/base_beagle.mrp"/>
 </component>
 <component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
+<unit bldFile="adapt/beagleboard/omap3530/kernel"/>
 </component>
 <component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
+<unit bldFile="adapt/beagleboard/omap3530/beagleboard"/>
 </component>
 </collection>
 </block>
 <block name="qemu" level="low" levels="hw-if" long-name="QEMU and Baseport">
 <collection name="qemu_baseport" long-name="Baseport" level="hw-if">
 <component name="syborg" long-name="Syborg" introduced="^2" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
+<unit bldFile="adapt/qemu/baseport/syborg" mrp="adapt/qemu/baseport/syborg/syborg.mrp"/>
 </component>
 </collection>
 </block>
 </layer>
 <layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" levels="hw-if adaptation framework test" long-name="Kernel and Hardware Services">
+<block name="kernelhwsrv" level="hw" levels="hw-if adapt framework test" long-name="Kernel and Hardware Services">
 <collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
 <component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
 <unit bldFile="os/kernelhwsrv/brdbootldr/ubootldr" mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
 </component>
 </collection>
 <collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
 <component name="asspandvariant" long-name="Template ASSP and Variant" introduced="6.0" purpose="development">
 <unit bldFile="os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
 </component>
 </collection>
-<collection name="kernel" long-name="Kernel Architecture" level="adaptation">
+<collection name="kernel" long-name="Kernel Architecture" level="adapt">
 <component name="eka" long-name="Kernel Architecture" introduced="8.0" purpose="mandatory">
 <unit bldFile="os/kernelhwsrv/kernel/eka" mrp="os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
 </component>
 </collection>
 <collection name="kerneltest" long-name="Kernel Test" level="hw-if">
 </component>
 <component name="f32test" long-name="File Server Tests" purpose="development">
 <unit bldFile="os/kernelhwsrv/kerneltest/f32test/group" mrp="os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/>
 </component>
 </collection>
-<collection name="ldds" long-name="Logical Device Drivers" level="adaptation">
+<collection name="ldds" long-name="Logical Device Drivers" level="adapt">
 <component name="ethernetldd" long-name="Ethernet Drivers" purpose="optional">
 <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
 </component>
 <component name="audioldd" long-name="Audio Drivers" introduced="8.1b" purpose="optional">
 <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/soundsc" mrp="os/kernelhwsrv/kernel/eka/drivers/soundsc/base_e32_drivers_sound.mrp"/>
 <component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="^2" purpose="development" class="config PC">
 <unit mrp="os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
 </component>
 </collection>
 </block>
-<block name="persistentdata" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Persistent Data Services">
+<block name="persistentdata" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Persistent Data Services">
 <collection name="featuremgmt" long-name="Feature Management" level="framework">
 <component name="featuremgr" long-name="Feature Manager" introduced="^3" purpose="mandatory">
 <unit bldFile="os/persistentdata/featuremgmt/featuremgr/group" mrp="os/persistentdata/featuremgmt/featuremgr/group/syslibs_featmgr.mrp"/>
 </component>
 <component name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
 <component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="^2" purpose="development" class="config PC">
 <unit mrp="os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
 </component>
 </collection>
 </block>
-<block name="devicesrv" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Device Services">
+<block name="devicesrv" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Device Services">
 <collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
 <component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" purpose="optional" class="api">
 <!-- this needs to be moved to deviceplatformrelease -->
 <unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
 </component>
 <component name="security_metadata" long-name="OS Security Metadata" introduced="^2" purpose="development" class="config PC">
 <unit mrp="os/security/security_info/security_metadata/security_metadata.mrp"/>
 </component>
 </collection>
 </block>
-<block name="lbs" level="services" levels="hw-if data-acquisition adaptation management application-interface" long-name="Locating Services">
+<block name="lbs" level="services" levels="hw-if data-acquisition adapt management application-interface" long-name="Locating Services">
 <collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
 <component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
 <unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
 </component>
 <component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" plugin="Y">
 </component>
 <component name="locationapesuplpsy" long-name="APE SUPL Positioning Module" introduced="^3" purpose="optional" plugin="Y">
 <unit bldFile="os/lbs/datasourcemodules/locationapesuplpsy/group" mrp="os/lbs/datasourcemodules/locationapesuplpsy/group/lbs_ape_supl_positioning_module.mrp"/>
 </component>
 </collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
+<collection name="datasourceadapt" long-name="Data Source Adaptation" level="adapt">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
+<component name="gpsdatasourceadapt" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
+<unit bldFile="os/lbs/datasourceadapt/gpsdatasourceadapt/group" mrp="os/lbs/datasourceadapt/gpsdatasourceadapt/group/lbs_gps_data_source_adapt.mrp"/>
 </component>
 </collection>
 <collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
 <component name="locationserver" long-name="Location Server" introduced="9.2" purpose="optional">
 <unit bldFile="os/lbs/locationrequestmgmt/locationserver/group" mrp="os/lbs/locationrequestmgmt/locationserver/group/lbs_locationserver.mrp"/>
 </component>
 <component name="networkgateway" long-name="Network Gateway" introduced="9.2" purpose="optional">
 <unit bldFile="os/lbs/locationmgmt/networkgateway/group" mrp="os/lbs/locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
 </component>
 </collection>
-<collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
+<collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adapt">
 <component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
 <unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
 </component>
 <component name="networkpmutils" long-name="Network Protocol Module Utilities" introduced="^3" purpose="optional" plugin="Y">
 <unit bldFile="os/lbs/networkprotocolmodules/networkpmutils/group" mrp="os/lbs/networkprotocolmodules/networkpmutils/group/lbs_networkpmutils.mrp"/>
 <component name="commstools" long-name="Comms Tools" introduced="^3" purpose="development" class="PC">
 <unit bldFile="os/commsfw/commsfwtools/commstools/group" mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
 </component>
 </collection>
 </block>
-<block name="networkingsrv" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Networking Services">
+<block name="networkingsrv" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Networking Services">
 <collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
 <component name="internetsockets" long-name="Internet Sockets" introduced="ER5" purpose="mandatory">
 <unit bldFile="os/networkingsrv/esockapiextensions/internetsockets/group" mrp="os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
 </component>
 </collection>
 <component name="wlannwif" long-name="WLAN Network Interface" filter="s60" purpose="optional">
 <unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
 </component>
 </collection>
 </block>
-<block name="cellularsrv" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Cellular Baseband Services">
+<block name="cellularsrv" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Cellular Baseband Services">
 <collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
 <component name="basebandchanneladaptor" long-name="Baseband Channel Adaptor" introduced="8.1" purpose="optional">
 <unit bldFile="os/cellularsrv/basebandabstraction/basebandchanneladaptor/group" mrp="os/cellularsrv/basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
 </component>
 </collection>
-<collection name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
+<collection name="basebandadaptplugins" long-name="Baseband Adaptation Plugins" level="adapt">
 <component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
+<unit bldFile="os/cellularsrv/basebandadaptplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
 </component>
 </collection>
 <collection name="smsprotocols" long-name="SMS Protocols" level="framework">
 <component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
 <unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
 </component>
 <component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="^2" purpose="development" class="config PC">
 <unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
 </component>
 </collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
+<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adapt">
 <component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
 <unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
 </component>
 </collection>
 <collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
 <component name="wapmessageapi" long-name="WAP Message API" purpose="optional">
 <unit bldFile="os/cellularsrv/wapstack/wapmessageapi/group" mrp="os/cellularsrv/wapstack/wapmessageapi/group/wap-stack_wapmessage.mrp"/>
 </component>
 </collection>
 </block>
-<block name="bt" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Bluetooth">
+<block name="bt" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Bluetooth">
 <collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
-<component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" purpose="optional" class="api">
+<component name="bluetooth_audio_adapt_api" long-name="Bluetooth Audio Adaptation API" filter="s60" purpose="optional" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
+<unit bldFile="os/bt/bt_plat/bluetooth_audio_adapt_api/group"/>
 </component>
 <component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" purpose="optional" class="api">
 <unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
 </component>
 <component name="at_command_handler_plugin_api" long-name="AT Command Handler Plugin API" filter="s60" purpose="optional" class="api">
 <component name="bt_metadata" long-name="Bluetooth Metadata" introduced="^3" purpose="development" class="config PC">
 <unit mrp="os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
 </component>
 </collection>
 <collection name="btsimulator" long-name="Bluetooth Simulator" level="internal-utils">
-<component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaption Stub" introduced="^3" filter="s60" purpose="optional">
+<component name="btaudioadapt_stub" long-name="Bluetooth Audio Adaption Stub" introduced="^3" filter="s60" purpose="optional">
-<unit bldFile="os/bt/btsimulator/btaudioadaptation_stub/group"/>
+<unit bldFile="os/bt/btsimulator/btaudioadapt_stub/group"/>
 </component>
 </collection>
 </block>
-<block name="usb" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="USB">
+<block name="usb" level="services" levels="adapt hw-if plugin framework server app-if" long-name="USB">
 <collection name="usb_plat" long-name="USB Platform Interfaces" level="app-if">
 <!-- placeholder for platform APIs -->
 </collection>
 <collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
 <!-- usbclientdrivers  to be moved here from kernelhwsrv-->
 <component name="usb_metadata" long-name="USB Metadata" introduced="^3" purpose="development" class="config PC">
 <unit mrp="os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
 </component>
 </collection>
 </block>
-<block name="mm" level="services" levels="adaptation hw-if device-fw devices middleware app-if" long-name="Multimedia">
+<block name="mm" level="services" levels="adapt hw-if device-fw devices middleware app-if" long-name="Multimedia">
 <collection name="mm_pub" long-name="Multimedia Public Interfaces" level="app-if">
 <component name="audio_effects_api" long-name="Audio Effects API" filter="s60" purpose="optional" class="api">
 <unit bldFile="os/mm/mm_pub/audio_effects_api/group" filter="!test"/>
 </component>
 <component name="audio_effects_presets_api" long-name="Audio Effects Presets API" filter="s60" purpose="optional" class="api">
 <unit bldFile="os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
 </component>
 <component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" purpose="optional" class="api">
 <unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
 </component>
-<component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" purpose="optional" class="api">
+<component name="devsound_adapt_api" long-name="DevSound Adaptation API" filter="s60" purpose="optional" class="api">
-<unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
+<unit bldFile="os/mm/mm_plat/devsound_adapt_api/group"/>
 </component>
 <component name="display_posting_api" long-name="Display Posting API" filter="s60" purpose="optional" class="api">
 <unit bldFile="os/mm/mm_plat/display_posting_api/group"/>
 </component>
 <component name="eaac_plus_decoder_interface_api" long-name="eAAC Plus Decoder Interface API" filter="s60" purpose="optional" class="api">
 <unit bldFile="os/mm/mm_plat/error_concealment_interface_msg_hdlr_api/group"/>
 </component>
 <component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" purpose="optional" class="api">
 <unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
 </component>
-<component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" purpose="optional" class="api">
+<component name="fm_radio_adapt_api" long-name="FM Radio Adaptation API" filter="s60" purpose="optional" class="api">
-<unit bldFile="os/mm/mm_plat/fm_radio_adaptation_api/group"/>
+<unit bldFile="os/mm/mm_plat/fm_radio_adapt_api/group"/>
 </component>
 <component name="g711_decoder_interface_api" long-name="G711 Decoder Interface API" filter="s60" purpose="optional" class="api">
 <unit bldFile="os/mm/mm_plat/g711_decoder_interface_api/group" filter="!test"/>
 </component>
 <component name="g711_decoder_interface_msg_hdlr_api" long-name="G711 Decoder Interface Message Handler API" filter="s60" purpose="optional" class="api">
 <unit bldFile="os/mm/mm_plat/ra8_decoder_interface_msg_hdlr_api/group"/>
 </component>
 <component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" purpose="optional" class="api">
 <unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
 </component>
-<component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" purpose="optional" class="api">
+<component name="rds_adapt_api" long-name="RDS Adaptation API" filter="s60" purpose="optional" class="api">
-<unit bldFile="os/mm/mm_plat/rds_adaptation_api/group"/>
+<unit bldFile="os/mm/mm_plat/rds_adapt_api/group"/>
 </component>
 <component name="restricted_audio_output_api" long-name="Restricted Audio Output API" filter="s60" purpose="optional" class="api">
 <unit bldFile="os/mm/mm_plat/restricted_audio_output_api/group" filter="!test"/>
 </component>
 <component name="restricted_audio_output_msg_hdlr_api" long-name="Restricted Audio Output Message Handler API" filter="s60" purpose="optional" class="api">
 </component>
 <component name="speechrecogsupport" long-name="Speech Recognition Support" introduced="7.0s" purpose="mandatory">
 <unit bldFile="os/mm/mmdevicefw/speechrecogsupport/group" mrp="os/mm/mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
 </component>
 </collection>
-<collection name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
+<collection name="mmswadapt" long-name="Multimedia Software Adaptation" level="adapt">
 <component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/mmswadaptation/videorenderer/group" mrp="os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
+<unit bldFile="os/mm/mmswadapt/videorenderer/group" mrp="os/mm/mmswadapt/videorenderer/group/multimedia_videorenderer.mrp"/>
 </component>
 </collection>
 <collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw"/>
 <collection name="omxil" long-name="OpenMAX IL" level="hw-if">
 <component name="omxilapi" long-name="OpenMAX IL API" introduced="^3" purpose="optional">
 </component>
 <component name="a3fsrvstart" long-name="A3F Server Start" introduced="^2" purpose="optional" plugin="Y">
 <unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
 </component>
 </collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
+<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adapt">
 <component name="devsoundhwdeviceapi" long-name="DevSound Hardware Device API" introduced="7.0s" purpose="optional">
 <unit bldFile="os/mm/devsound/hwdevapi/group" mrp="os/mm/devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
 </component>
 <component name="a3facl" long-name="A3F Audio Component Library" introduced="^2" purpose="development">
 <unit bldFile="os/mm/mmhais/a3facl/group" mrp="os/mm/mmhais/a3facl/group/multimedia_a3f_acl.mrp"/>
 </component>
 <component name="a3fdevsoundcustomisation" long-name="A3F DevSound Customisation" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/mmhais/a3fdevsoundcustomisation/group" mrp="os/mm/mmhais/a3fdevsoundcustomisation/group/multimedia_a3f_devsoundadaptationinfo.mrp"/>
+<unit bldFile="os/mm/mmhais/a3fdevsoundcustomisation/group" mrp="os/mm/mmhais/a3fdevsoundcustomisation/group/multimedia_a3f_devsoundadaptinfo.mrp"/>
 </component>
 <component name="refacladapt" long-name="Reference ACL Adaptation" introduced="^2" purpose="optional">
-<unit bldFile="os/mm/mmhais/refacladapt/group" mrp="os/mm/mmhais/refacladapt/group/multimedia_a3f_refacladaptation.mrp"/>
+<unit bldFile="os/mm/mmhais/refacladapt/group" mrp="os/mm/mmhais/refacladapt/group/multimedia_a3f_refacladapt.mrp"/>
 </component>
 <component name="videohai" long-name="Video HAI" introduced="7.0s" purpose="mandatory">
 <unit bldFile="os/mm/mmhais/videohai/group" mrp="os/mm/mmhais/videohai/group/multimedia_videohai.mrp"/>
 </component>
 <component name="dvbhreceiverhai" long-name="Mobile TV DVB-H Receiver HAI" introduced="^2" purpose="optional">
 <unit bldFile="os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group" mrp="os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group/multimedia_mobiletv_dvbh_hai.mrp"/>
 </component>
 </collection>
 </block>
-<block name="imagingext" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Imaging Extensions">
+<block name="imagingext" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Imaging Extensions">
 <collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
 <component name="exif_api" long-name="Exif API" filter="s60" purpose="optional" class="api">
 <unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
 </component>
 </collection>
 </component>
 <component name="ecam_use_case_hint_custom_api" long-name="ECam Use Case Hint Custom API" introduced="^3" filter="s60" purpose="optional" class="api">
 <unit bldFile="os/imagingext/imagingext_plat/ecam_use_case_hint_custom_api/group"/>
 </component>
 </collection>
-<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
+<collection name="imageadaptextensions" long-name="Image Adaptation Extensions" level="app-if">
 <component name="iclextjpegapi" long-name="ICL Extension JPEG API" filter="s60" purpose="optional">
-<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
+<unit bldFile="os/imagingext/imageadaptextensions/iclextjpegapi/group"/>
 </component>
-<component name="imageadaptationextensions_build" long-name="Image Adaptation Extensions Build" filter="s60" purpose="optional">
+<component name="imageadaptextensions_build" long-name="Image Adaptation Extensions Build" filter="s60" purpose="optional">
 <!--  Move the export from this bld.inf into the above one and remove this component, or make this a ROM component -->
-<unit bldFile="os/imagingext/imageadaptationextensions/group"/>
+<unit bldFile="os/imagingext/imageadaptextensions/group"/>
 </component>
 </collection>
 <collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
 <component name="exiflib" long-name="Exif Library" filter="s60" purpose="optional">
 <unit bldFile="os/imagingext/imagingmodules/exiflib/group"/>
 <component name="jp2kcodec" long-name="JPEG2000 Decoder Plugin" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
 </component>
 </collection>
 </block>
-<block name="graphics" level="services" levels="adaptation engines internal-adaptations device-interface internal-utils app-if" long-name="Graphics">
+<block name="graphics" level="services" levels="adapt engines internal-adapts device-interface internal-utils app-if" long-name="Graphics">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
+<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adapt">
 <component name="vgi" long-name="VGI" filter="s60" purpose="optional">
 <unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
 </component>
 </collection>
-<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
+<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adapts">
 <component name="m3gcore11" long-name="M3G Core 1.1" filter="s60" purpose="optional">
 <unit bldFile="os/graphics/m3g/m3gcore11/group"/>
 </component>
 </collection>
 <collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
 <component name="graphicsresource" long-name="Graphics Resource" introduced="^3" deprecated="^3" purpose="optional">
 <unit bldFile="os/graphics/graphicsresourceservices/graphicsresource/group" mrp="os/graphics/graphicsresourceservices/graphicsresource/group/graphics_graphicsresource.mrp"/>
 </component>
-<component name="graphicsresourceadaptation" long-name="Graphics Resource Adaptation" introduced="^3" deprecated="^3" purpose="optional">
+<component name="graphicsresourceadapt" long-name="Graphics Resource Adaptation" introduced="^3" deprecated="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceadaptation/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceadaptation/group/graphics_graphicsresourceadapter.mrp"/>
+<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceadapt/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceadapt/group/graphics_graphicsresourceadapter.mrp"/>
 </component>
 <component name="graphicsresourceimplementation" long-name="Graphics Resource Implementation" introduced="^4" purpose="optional">
 <unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group/graphics_graphicsresourceimplementation.mrp"/>
 </component>
 <component name="graphicsresourceinterface" long-name="Graphics Resource Interface" introduced="^4" purpose="optional">
 <collection name="graphicsutils" long-name="Graphics Utils" level="engines">
 <component name="commongraphicsheaders" long-name="Common Graphics Headers" introduced="^3" purpose="mandatory">
 <unit bldFile="os/graphics/graphicsutils/commongraphicsheaders/group" mrp="os/graphics/graphicsutils/commongraphicsheaders/group/graphics_commonheader.mrp"/>
 </component>
 </collection>
-<collection name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
+<collection name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adapt">
 <!-- displayldd to be moved here -->
 <component name="surfacemgr" long-name="Surface Manager" introduced="^3" purpose="optional">
 <unit bldFile="os/graphics/graphicshwdrivers/surfacemgr/group" mrp="os/graphics/graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>
 </component>
 </collection>
 <collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
 <component name="fontandbitmapserver" long-name="Font and Bitmap Server" purpose="mandatory">
 <unit bldFile="os/graphics/fbs/fontandbitmapserver/group" mrp="os/graphics/fbs/fontandbitmapserver/group/graphics_fbserv.mrp"/>
 </component>
 </collection>
-<collection name="opengles" long-name="OpenGLES" level="internal-adaptations">
+<collection name="opengles" long-name="OpenGLES" level="internal-adapts">
 <component name="openglesinterface" long-name="OpenGL ES Interface" introduced="8.0" purpose="optional">
 <unit bldFile="os/graphics/opengles/openglesinterface/group" mrp="os/graphics/opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
 </component>
 <component name="opengles_stub" long-name="OpenGL ES Stub" introduced="^2" filter="sf_build" purpose="optional">
 <unit bldFile="os/graphics/opengles/openglesinterface/group/opengles_stub"/>
 </component>
 </collection>
-<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
+<collection name="openvg" long-name="OpenVG" level="internal-adapts">
 <component name="openvginterface" long-name="OpenVG Interface" introduced="^2" purpose="optional">
 <unit bldFile="os/graphics/openvg/openvginterface/group" mrp="os/graphics/openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
 </component>
 <component name="openvg11" long-name="OpenVG 1.1" filter="s60" purpose="optional">
 <!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
 </component>
 <component name="sfopenvg" long-name="Khronos OpenVG Reference Implementation" introduced="^2" filter="sf_build" purpose="optional">
 <unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
 </component>
 </collection>
-<collection name="egl" long-name="EGL" level="internal-adaptations">
+<collection name="egl" long-name="EGL" level="internal-adapts">
 <component name="eglinterface" long-name="EGL Interface" introduced="^2" purpose="mandatory">
 <unit bldFile="os/graphics/egl/eglinterface/group" mrp="os/graphics/egl/eglinterface/group/graphics_eglheaders.mrp"/>
 </component>
 <component name="eglswitch" long-name="EGL Switch" introduced="^3" purpose="optional">
 <unit bldFile="os/graphics/egl/eglswitch/group" mrp="os/graphics/egl/eglswitch/group/graphics_eglswitch.mrp"/>
 <unit bldFile="os/graphics/graphicsdeviceinterface/directgdi/group" mrp="os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
 </component>
 <component name="directgdiinterface" long-name="DirectGDI Interface" introduced="^3" deprecated="^3" purpose="optional">
 <unit bldFile="os/graphics/graphicsdeviceinterface/directgdiinterface/group" mrp="os/graphics/graphicsdeviceinterface/directgdiinterface/group/graphics_directgdiheaders.mrp"/>
 </component>
-<component name="directgdiadaptation" long-name="DirectGDI Adaptation" introduced="^3" deprecated="^3" purpose="optional">
+<component name="directgdiadapt" long-name="DirectGDI Adaptation" introduced="^3" deprecated="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/directgdiadaptation/group" mrp="os/graphics/graphicsdeviceinterface/directgdiadaptation/group/graphics_directgdiadapter.mrp"/>
+<unit bldFile="os/graphics/graphicsdeviceinterface/directgdiadapt/group" mrp="os/graphics/graphicsdeviceinterface/directgdiadapt/group/graphics_directgdiadapter.mrp"/>
 </component>
 </collection>
 <collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
 <component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC">
 <unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
 </component>
 <component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
 <unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
 </component>
 </collection>
-<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
+<collection name="hwresourceadapt" long-name="Hardware Resource Adaptation" level="generic">
 <component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" deprecated="^4" purpose="optional" plugin="Y">
-<unit bldFile="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
+<unit bldFile="mw/appsupport/hwresourceadapt/hwresourcemgruiplugin/group" mrp="mw/appsupport/hwresourceadapt/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
 </component>
 </collection>
 <collection name="commonappservices" long-name="Common Application Services" level="framework">
 <component name="alarmserver" long-name="Alarm Server" introduced="7.0" purpose="optional">
 <unit bldFile="mw/appsupport/commonappservices/alarmserver/Group" mrp="mw/appsupport/commonappservices/alarmserver/Group/app-services_alarmserver.mrp"/>
 <unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
 </component>
 <component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" purpose="optional" class="api">
 <unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
 </component>
-<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" purpose="optional" class="api">
+<component name="devencadapt_api" long-name="Device Encryption Adaptation API" filter="s60" purpose="optional" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
+<unit bldFile="mw/securitysrv/secsrv_plat/devencadapt_api/group"/>
 </component>
 <component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" purpose="optional" class="api">
 <unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
 </component>
 </collection>

changeset 763	79fffd551b70
parent 742	f23494cc09c8