--- a/symbian3/single/sysdefs/system_model.xml Thu Mar 18 11:43:11 2010 +0000
+++ b/symbian3/single/sysdefs/system_model.xml Fri Mar 19 14:46:47 2010 +0000
@@ -138,7 +138,7 @@
<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
- <unit mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
+ <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">
@@ -325,6 +325,280 @@
</collection>
</block>
<block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
+ <collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
+ <component name="boost_apis" long-name="Boost APIs" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/boost_apis/group"/>
+ </component>
+ <component name="cpp_wrappers" long-name="Cpp wrappers" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/cpp_wrappers/group"/>
+ </component>
+ <component name="character_type_apis" long-name="Character Type APIs" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/character_type_apis/group"/>
+ </component>
+ <component name="compiler_specific_runtime_support" long-name="Compiler Specific Runtime Support" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
+ </component>
+ <component name="ossrv_configuration_api" long-name="Generic OS Services Configuration API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/configuration/group"/>
+ </component>
+ <component name="crypto_authentication_codes_and_hash_functions_api" long-name="Crypto Authentication Codes and Hash Functions API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
+ </component>
+ <component name="crypto_auxillary_functions_api" long-name="Crypto Auxillary Functions API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
+ </component>
+ <component name="crypto_certificates_api" long-name="Crypto Certificates API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
+ </component>
+ <component name="crypto_inputoutput_and_data_encoding_api" long-name="Crypto Input/Output and Data Encoding API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
+ </component>
+ <component name="crypto_public_key_cryptography_and_key_agreement_api" long-name="Crypto Public Key Cryptography and Key Agreement API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
+ </component>
+ <component name="crypto_symmetric_ciphers_api" long-name="Crypto Symmetric Ciphers API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
+ </component>
+ <component name="crypto_utility_functions_api" long-name="Crypto Utility Functions API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
+ </component>
+ <component name="cryptogaphy_related_api" long-name="Cryptogaphy Related API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
+ </component>
+ <component name="ossrv_debug_api" long-name="Generic OS Services Debug API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/debug/group"/>
+ </component>
+ <component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
+ </component>
+ <component name="gboxed" long-name="GBoxed API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/gboxed/group"/>
+ </component>
+ <component name="glib_arrays" long-name="Glib Arrays API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_arrays/group"/>
+ </component>
+ <component name="glib_asynchronous_queues" long-name="Glib Asynchronous Queues API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
+ </component>
+ <component name="glib_atomic_operations" long-name="Glib Atomic Operations API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
+ </component>
+ <component name="glib_automatic_string_completion" long-name="Glib Automatic String Completion API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
+ </component>
+ <component name="glib_balanced_binary_trees" long-name="Glib Balanced Binary Trees API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
+ </component>
+ <component name="glib_basic_types" long-name="Glib Basic Types API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_basic_types/group"/>
+ </component>
+ <component name="glib_caches" long-name="Glib Caches API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_caches/group"/>
+ </component>
+ <component name="glib_character_set_conversion" long-name="Glib Character Set Conversion API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
+ </component>
+ <component name="glib_closures" long-name="Glib Closures API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_closures/group"/>
+ </component>
+ <component name="glib_commandline_option_parser" long-name="Glib Command Line Option Parser API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
+ </component>
+ <component name="glib_datasets" long-name="Glib Datasets API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_datasets/group"/>
+ </component>
+ <component name="glib_date_and_time_functions" long-name="Glib Date and Time Functions API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
+ </component>
+ <component name="glib_doubleended_queues" long-name="Glib Double-ended Queues API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
+ </component>
+ <component name="glib_doublylinked_lists" long-name="Glib Doubly-Linked Lists API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
+ </component>
+ <component name="glib_dynamic_loading_of_modules" long-name="Glib Dynamic Loading of Modules API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
+ </component>
+ <component name="glib_enums_and_flags" long-name="Glib Enums and Flags API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
+ </component>
+ <component name="glib_error_reporting" long-name="Glib Error Reporting API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_error_reporting/group"/>
+ </component>
+ <component name="glib_file_utilities" long-name="Glib File Utilities API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_file_utilities/group"/>
+ </component>
+ <component name="glib_generic_values" long-name="Glib Generic Values API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_generic_values/group"/>
+ </component>
+ <component name="glib_globstyle_pattern_matching" long-name="Glib Glob-Style Pattern Matching API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
+ </component>
+ <component name="glib_hash_tables" long-name="Glib Hash Tables API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_hash_tables/group"/>
+ </component>
+ <component name="glib_hook_functions" long-name="Glib Hook Functions API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_hook_functions/group"/>
+ </component>
+ <component name="glib_internationalization" long-name="Glib Internationalization API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_internationalization/group"/>
+ </component>
+ <component name="glib_io_channels" long-name="Glib I/O Channels API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_io_channels/group"/>
+ </component>
+ <component name="glib_keyvalue_file_parser" long-name="Glib Key-Value File Parser API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
+ </component>
+ <component name="glib_lexical_scanner" long-name="Glib Lexical Scanner API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
+ </component>
+ <component name="glib_main_event_loop" long-name="Glib Main Event Loop API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
+ </component>
+ <component name="glib_memory_allocation" long-name="Glib Memory Allocation API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
+ </component>
+ <component name="glib_memory_slices" long-name="Glib Memory Slices API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_memory_slices/group"/>
+ </component>
+ <component name="glib_message_logging" long-name="Glib Message Logging API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_message_logging/group"/>
+ </component>
+ <component name="glib_miscellaneous_utility_functions" long-name="Glib Miscellaneous Utility Functions API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
+ </component>
+ <component name="glib_nary_trees" long-name="Glib N-ary Trees API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_nary_trees/group"/>
+ </component>
+ <component name="glib_parameters_and_values" long-name="Glib Parameters and Values API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
+ </component>
+ <component name="glib_quarks" long-name="Glib Quarks API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_quarks/group"/>
+ </component>
+ <component name="glib_random_numbers" long-name="Glib Random Numbers API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_random_numbers/group"/>
+ </component>
+ <component name="glib_relations_and_tuples" long-name="Glib Relations and Tuples API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
+ </component>
+ <component name="glib_shellrelated_utilities" long-name="Glib Shell-related Utilities API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
+ </component>
+ <component name="glib_signals" long-name="Glib Signals API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_signals/group"/>
+ </component>
+ <component name="glib_simple_xml_subset_parser" long-name="Glib Simple XML Subset Parser API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
+ </component>
+ <component name="glib_singlylinked_lists" long-name="Glib Singly-Linked Lists API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
+ </component>
+ <component name="glib_spawning_processes" long-name="Glib Spawning Processes API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
+ </component>
+ <component name="glib_standard_macros" long-name="Glib Standard Macros API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_standard_macros/group"/>
+ </component>
+ <component name="glib_string_utility_functions" long-name="Glib String Utility Functions API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
+ </component>
+ <component name="glib_strings" long-name="Glib Strings API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_strings/group"/>
+ </component>
+ <component name="glib_thread_pools" long-name="Glib Thread Pools API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_thread_pools/group"/>
+ </component>
+ <component name="glib_threads" long-name="Glib Threads API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_threads/group"/>
+ </component>
+ <component name="glib_timers" long-name="Glib Timers API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_timers/group"/>
+ </component>
+ <component name="glib_unicode_manipulation" long-name="Glib Unicode Manipulation API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
+ </component>
+ <component name="glib_value_arrays" long-name="Glib Value Arrays API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
+ </component>
+ <component name="glib_varargs_value_collection" long-name="Glib Varargs Value Collection API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
+ </component>
+ <component name="gobject" long-name="GObject API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/gobject/group"/>
+ </component>
+ <component name="gparamspec" long-name="GParamSpec API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/gparamspec/group"/>
+ </component>
+ <component name="gtype" long-name="GType API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/gtype/group"/>
+ </component>
+ <component name="gtypemodule" long-name="GTypeModule API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/gtypemodule/group"/>
+ </component>
+ <component name="gtypeplugin" long-name="GTypePlugin API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/gtypeplugin/group"/>
+ </component>
+ <component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
+ </component>
+ <component name="localization_function_api" long-name="Localization Function API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/localization_function_api/group"/>
+ </component>
+ <component name="math_operations_api" long-name="Math Operations API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/math_operations_api/group"/>
+ </component>
+ <component name="ossrv_memory_api" long-name="Generic OS Services Memory API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/memory/group"/>
+ </component>
+ <component name="no_namespace_headers" long-name="No Namespace Headers" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/no_namespace_headers/group"/>
+ </component>
+ <component name="openc_headers" long-name="OpenC headers" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/openc_headers/group"/>
+ </component>
+ <component name="openc_wrappers" long-name="OpenC wrappers" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/openc_wrappers/group"/>
+ </component>
+ <component name="ssl_general_api" long-name="SSL General API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/group"/>
+ </component>
+ <component name="ssl_protocol_methods_api" long-name="SSL Protocol Methods API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
+ </component>
+ <component name="standard_compressiondecompression_api" long-name="Standard Compression/Decompression API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
+ </component>
+ <component name="stl" long-name="STL API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/stl/group"/>
+ </component>
+ <component name="thread_api" long-name="Thread API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/thread_api/group"/>
+ </component>
+ <component name="type_attributes" long-name="Type Attributes API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/type_attributes/group"/>
+ </component>
+ <component name="typeinfo" long-name="Type Info API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/typeinfo/group"/>
+ </component>
+ <component name="utility_apis" long-name="Utility APIs" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/utility_apis/group"/>
+ </component>
+ <component name="wide_character_classapis" long-name="Wide character class/apis" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/wide_character_classapis/group"/>
+ </component>
+ <component name="dbus_api" long-name="Dbus API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/dbus/group"/>
+ </component>
+ <component name="dbus-glib" long-name="Dbus-glib API" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
+ </component>
+ </collection>
+ <collection name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" level="utilities">
+ <component name="libutils_apis" long-name="Utility Library APIs" filter="s60" class="api">
+ <unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
+ </component>
+ </collection>
<collection name="stdlibs" long-name="Standard Libraries" level="translation">
<component name="libz" filter="s60" long-name="Z Compression Library">
<unit bldFile="os/ossrv/stdlibs/libz/group"/>
@@ -343,19 +617,24 @@
</collection>
<collection name="glib" long-name="GLib" level="utilities">
<component name="glibbackend" filter="s60" long-name="GLib Backend">
- <unit bldFile="os/ossrv/glib/glibbackend/group"/>
+ <unit bldFile="os/ossrv/glib/build/symbian/glibbackend/group"/>
+ <!-- Move to here: <unit bldFile="glib/glibbackend/group"/> -->
</component>
<component name="libglib" filter="s60" long-name="GLib Library">
- <unit bldFile="os/ossrv/glib/libglib/group"/>
+ <unit bldFile="os/ossrv/glib/build/symbian/glib/group"/>
+ <!-- Move to here: <unit bldFile="glib/libglib/group"/> -->
</component>
<component name="libgthread" filter="s60" long-name="Libg Thread">
- <unit bldFile="os/ossrv/glib/libgthread/group"/>
+ <unit bldFile="os/ossrv/glib/build/symbian/gthread/group"/>
+ <!-- Move to here: <unit bldFile="glib/libgthread/group"/> -->
</component>
<component name="libgmodule" filter="s60" long-name="Libg Module">
- <unit bldFile="os/ossrv/glib/libgmodule/group"/>
+ <unit bldFile="os/ossrv/glib/build/symbian/gmodule/group"/>
+ <!-- Move to here: <unit bldFile="glib/libgmodule/group"/> -->
</component>
<component name="libgobject" filter="s60" long-name="Libg Object">
- <unit bldFile="os/ossrv/glib/libgobject/group"/>
+ <unit bldFile="os/ossrv/glib/build/symbian/gobject/group"/>
+ <!-- Move to here: <unit bldFile="glib/libgobject/group"/> -->
</component>
</collection>
<collection name="stdcpp" long-name="C++ Standard Library" level="translation">
@@ -424,6 +703,9 @@
<component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
<unit bldFile="os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
</component>
+ <component name="liboil" long-name="Liboil" introduced="^4" purpose="optional">
+ <unit bldFile="os/ossrv/genericopenlibs/liboil/group" mrp="os/ossrv/genericopenlibs/liboil/group/oeaddons_liboil.mrp"/>
+ </component>
</collection>
<collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
<component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
@@ -439,13 +721,7 @@
<collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
<component name="ossrv_build" filter="s60" long-name="Generic OS Services Build">
<!-- exports should be moved to individual components -->
- <unit bldFile="os/ossrv/rom"/>
- </component>
- <component name="ossrv_plat" filter="s60" long-name="Generic OS Services Platform Interfaces" class="api">
- <unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
- </component>
- <component name="ossrv_pub" filter="s60" long-name="Generic OS Services Public Interfaces" class="api">
- <unit bldFile="os/ossrv/ossrv_pub/group"/>
+ <unit bldFile="os/ossrv/group"/>
</component>
<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"/>
@@ -504,6 +780,196 @@
</collection>
</block>
<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
+ <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" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
+ </component>
+ <component name="common_platform_security_definitions_api" long-name="Common Platform Security Definitions API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
+ </component>
+ <component name="feature_discovery_api" long-name="Feature Discovery API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
+ </component>
+ <component name="platform_environment_api" long-name="Platform Environment API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
+ </component>
+ <component name="sensor_channel_api" long-name="Sensor Channel API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
+ </component>
+ <component name="sensor_definitions_api" long-name="Sensor Definitions API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
+ </component>
+ <component name="version_info_api" long-name="Version Info API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/group"/>
+ </component>
+ <component name="accessory_monitoring_api" long-name="Accessory Monitoring API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
+ </component>
+ <component name="haptics_api" long-name="Haptics API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_pub/haptics_api/group"/>
+ </component>
+ <component name="sensor_data_compensator_api" long-name="Sensor Data Compensator API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
+ </component>
+ <component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/inc/platform_paths.hrh"/>
+ </component>
+ </collection>
+ <collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
+ <component name="configuration_file_parser_api" long-name="Configuration File Parser API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
+ </component>
+ <component name="dos_extension_plugin_api" long-name="DOS Extension Plug-In API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
+ </component>
+ <component name="mediator_command_initiator_api" long-name="Mediator Command Initiator API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
+ </component>
+ <component name="syslangutil_api" long-name="SysLangUtil API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
+ </component>
+ <component name="wakeup_alarm_api" long-name="Wakeup Alarm API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
+ </component>
+ <component name="disk_and_memory_level_keys_api" long-name="Disk and Memory Level Keys API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
+ </component>
+ <component name="mediator_plugin_api" long-name="Mediator Plugin API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
+ </component>
+ <component name="headset_status_api" long-name="Headset Status API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/headset_status_api/group"/>
+ </component>
+ <component name="system_startup_extension_plugin_api" long-name="System Startup Extension Plugin API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
+ </component>
+ <component name="sensor_plugin_api" long-name="Sensor Plugin API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
+ </component>
+ <component name="accessory_api" long-name="Accessory API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/accessory_api/group"/>
+ </component>
+ <component name="display_language_definition_api" long-name="Display Language Definition API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
+ </component>
+ <component name="mediator_command_responder_api" long-name="Mediator Command Responder API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
+ </component>
+ <component name="accessory_policy_definitions_api" long-name="Accessory Policy Definitions API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
+ </component>
+ <component name="hw_settings_api" long-name="Hardware Settings API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
+ </component>
+ <component name="mediator_domain_definitions_api" long-name="Mediator Domain Definitions API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
+ </component>
+ <component name="sensor_extension_api" long-name="Sensor Extension API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
+ </component>
+ <component name="accessory_plugin_api" long-name="Accessory Plugin API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
+ </component>
+ <component name="sae_api" long-name="SAE API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/sae_api/group"/>
+ </component>
+ <component name="accessory_control_api" long-name="Accessory Control API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
+ </component>
+ <component name="mediator_static_registration_api" long-name="Mediator Static Registration API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
+ </component>
+ <component name="accessory_key_event_handling_api" long-name="Accessory Key Event Handling API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
+ </component>
+ <component name="mediator_notification_api" long-name="Mediator Notification API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
+ </component>
+ <component name="accessory_policy_utility_api" long-name="Accessory Policy Utility API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
+ </component>
+ <component name="common_dsy_plugin_api" long-name="Common DSY Plugin API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
+ </component>
+ <component name="remote_control_extension_api" long-name="Remote Control Extension API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
+ </component>
+ <component name="sensor_channel_filter_api" long-name="Sensor Channel Filter API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
+ </component>
+ <component name="dos_extension_api" long-name="DOS Extension API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
+ </component>
+ <component name="accessory_audio_control_api" long-name="Accessory Audio Control API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
+ </component>
+ <component name="mediator_event_consumer_api" long-name="Mediator Event Consumer API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
+ </component>
+ <component name="shared_data_api" long-name="Shared Data API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/shared_data_api/group"/>
+ </component>
+ <component name="accessory_settings_api" long-name="Accessory Settings API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
+ </component>
+ <component name="accessory_bluetooth_control_api" long-name="Accessory Bluetooth Control API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
+ </component>
+ <component name="extended_version_info_api" long-name="Extended Version Info API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
+ </component>
+ <component name="mediator_event_provider_api" long-name="Mediator Event Provider API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
+ </component>
+ <component name="tv_out_config_api" long-name="TV Out Config API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
+ </component>
+ <component name="tspclientmapper_api" long-name="TSP Client Mapper API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
+ </component>
+ <component name="powersave_api" long-name="Power Save API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/powersave_api/group"/>
+ </component>
+ <component name="powersave_definitions_api" long-name="Power Save Definitions API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
+ </component>
+ <component name="powersave_plugin_api" long-name="Power Save Plugin API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
+ </component>
+ <component name="extended_version_info_plugin_api" long-name="Extended Version Info Plugin API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
+ </component>
+ <component name="haptics_plugin_api" long-name="Haptics Plugin API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
+ </component>
+ <component name="haptics_effect_data_getter_plugin_api" long-name="Haptics Effect Data Getter Plugin API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
+ </component>
+ <component name="haptics_packetizer_plugin_api" long-name="Haptics Packetizer Plugin API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
+ </component>
+ <component name="tiltcompensation_api" long-name="Tilt Compensation API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
+ </component>
+ <component name="disk_notification_handler_api" long-name="Disk Notification Handler API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
+ </component>
+ <component name="accessory_policy_usb_audio_api" long-name="Accessory Policy USB Audio API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
+ </component>
+ <component name="accessory_policy_hdmi_audio_api" long-name="Accessory Policy HDMI Audio API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
+ </component>
+ <component name="sensor_data_compensator_plugin_api" long-name="Sensor Data Compensator Plugin API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
+ </component>
+ <component name="ddc_access_api" long-name="DDC Access API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
+ </component>
+ <component name="tv_out_behaviour_api" long-name="TV Out Behaviour API" filter="s60" class="api">
+ <unit bldFile="os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
+ </component>
+ </collection>
<collection name="accessoryservices" long-name="Accessory Services" level="framework">
<component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
<unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
@@ -681,14 +1147,6 @@
</collection>
<collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if"/>
<collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
- <component name="devicesrv_plat" filter="s60" long-name="Device Services Platform Interfaces" class="api">
- <unit bldFile="os/devicesrv/devicesrv_plat/group"/>
- </component>
- <component name="devicesrv_pub" filter="s60" long-name="Device Services Public Interfaces" class="api">
- <unit bldFile="os/devicesrv/devicesrv_pub/group"/>
- <unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group" filter="bldmefirst"/>
- <!-- separate to another component? -->
- </component>
<component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
<unit mrp="os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
</component>
@@ -715,6 +1173,12 @@
<component name="cafrecogniserconfig" long-name="CAF Recogniser Config" introduced="9.1" purpose="mandatory">
<unit bldFile="os/security/contentmgmt/cafrecogniserconfig" mrp="os/security/contentmgmt/cafrecogniserconfig/security_reccafconfig.mrp"/>
</component>
+ <component name="referencedrmagent" long-name="Reference DRM Agent" introduced="8.0" purpose="development">
+ <unit bldFile="os/security/contentmgmt/referencedrmagent/RefTestAgent/group" mrp="os/security/contentmgmt/referencedrmagent/RefTestAgent/group/security_rta.mrp"/>
+ </component>
+ <component name="cafstreamingsupport" long-name="CAF Streaming Support" introduced="^3" purpose="optional">
+ <unit bldFile="os/security/contentmgmt/cafstreamingsupport/group" mrp="os/security/contentmgmt/cafstreamingsupport/group/security_streamingcaf.mrp"/>
+ </component>
</collection>
<collection name="crypto" long-name="Crypto Libraries" level="libraries">
<component name="weakcryptospi" long-name="Weak Crypto SPI" filter="gt" introduced="^3" purpose="optional">
@@ -761,6 +1225,10 @@
<component name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
<unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
</component>
+ <component name="rootcertificates" filter="sf_build" long-name="Root Certificates" introduced="7.0s" purpose="optional">
+ <!-- not in S60 codebase -->
+ <unit bldFile="os/security/cryptoservices/rootcertificates/group" mrp="os/security/cryptoservices/rootcertificates/group/rootcerts.mrp"/>
+ </component>
<component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
<unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
</component>
@@ -1067,6 +1535,58 @@
</collection>
</block>
<block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
+ <collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
+ <component name="wlan_dbif_api" long-name="WLAN DBIF API" filter="s60" class="api">
+ <unit bldFile="os/wlan/wlan_plat/wlan_dbif_api/group"/>
+ </component>
+ <component name="wlan_hal_api" long-name="WLAN HAL API" filter="s60" class="api">
+ <unit bldFile="os/wlan/wlan_plat/wlan_hal_api/group"/>
+ </component>
+ <component name="wlan_management_api" long-name="WLAN Management API" filter="s60" class="api">
+ <unit bldFile="os/wlan/wlan_plat/wlan_management_api/group"/>
+ </component>
+ <component name="wlan_device_settings_api" long-name="WLAN Device Settings API" filter="s60" class="api">
+ <unit bldFile="os/wlan/wlan_plat/wlan_device_settings_api/group"/>
+ </component>
+ <component name="wlan_control_api" long-name="WLAN Control API" filter="s60" class="api">
+ <unit bldFile="os/wlan/wlan_plat/wlan_control_api/group"/>
+ </component>
+ <component name="wlan_hw_initialization_data_api" long-name="WLAN Hardware Initialization Data API" filter="s60" class="api">
+ <unit bldFile="os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
+ </component>
+ <component name="wlan_power_save_plugin_api" long-name="WLAN Power Save Plugin API" filter="s60" class="api">
+ <unit bldFile="os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
+ </component>
+ <component name="wlan_info_api" long-name="WLAN Info API" filter="s60" class="api">
+ <unit bldFile="os/wlan/wlan_plat/wlan_info_api/group"/>
+ </component>
+ <component name="wlan_agent_hotspot_plugin_api" long-name="WLAN Agent Hotspot Plug-in API" filter="s60" class="api">
+ <unit bldFile="os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
+ </component>
+ <component name="wlan_osa_api" long-name="WLAN OSA API" filter="s60" class="api">
+ <unit bldFile="os/wlan/wlan_plat/wlan_osa_api/group"/>
+ </component>
+ <component name="wlan_spia_api" long-name="WLAN SPIA API" filter="s60" class="api">
+ <unit bldFile="os/wlan/wlan_plat/wlan_spia_api/group"/>
+ </component>
+ <component name="wlan_hpa_api" long-name="WLAN HPA API" filter="s60" class="api">
+ <unit bldFile="os/wlan/wlan_plat/wlan_hpa_api/group"/>
+ </component>
+ <component name="wlan_eapol_plugin_api" long-name="WLAN EAPOL Plugin API" filter="s60" class="api">
+ <unit bldFile="os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
+ </component>
+ <component name="wlan_generic_plugin_api" long-name="WLAN Generic Plugin API" filter="s60" class="api">
+ <unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
+ </component>
+ <component name="wlan_aws_plugin_api" long-name="WLAN AWS Plugin API" filter="s60" class="api">
+ <unit bldFile="os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
+ </component>
+ </collection>
+ <collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
+ <component name="wlan_sdk_info_api" long-name="WLAN SDK Info API" filter="s60" class="api">
+ <unit bldFile="os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
+ </component>
+ </collection>
<collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
<component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
<unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/>
@@ -1090,12 +1610,6 @@
</collection>
<collection name="wlanapitest" long-name="WLAN API Tests" level="test"/>
<collection name="wlan_info" long-name="WLAN Info" level="test">
- <component name="wlan_pub" filter="s60" long-name="WLAN Public Interfaces" class="api">
- <unit bldFile="os/wlan/wlan_pub/group"/>
- </component>
- <component name="wlan_plat" filter="s60" long-name="WLAN Platform Interfaces" class="api">
- <unit bldFile="os/wlan/wlan_plat/group"/>
- </component>
<component name="wlan_metadata" long-name="WLAN Metadata" introduced="^2" purpose="development" class="config PC">
<unit mrp="os/wlan/wlan_info/wlan_metadata/wlan_metadata.mrp"/>
</component>
@@ -1112,11 +1626,6 @@
<unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
</component>
</collection>
- <collection name="fax" long-name="Fax" level="server">
- <component name="faxclientandserver" long-name="Fax Client and Server" purpose="optional">
- <unit bldFile="os/cellularsrv/fax/faxclientandserver/Group" mrp="os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.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"/>
@@ -1215,6 +1724,17 @@
<collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
</block>
<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
+ <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" class="api">
+ <unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
+ </component>
+ <component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" 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" class="api">
+ <unit bldFile="os/bt/bt_plat/at_command_handler_plugin_api/group"/>
+ </component>
+ </collection>
<collection name="bluetooth" long-name="Bluetooth Core" level="framework">
<component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
<unit bldFile="os/bt/bluetooth/btstack" mrp="os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
@@ -1281,15 +1801,17 @@
</component>
</collection>
<collection name="bt_info" long-name="Bluetooth Info" level="app-if">
- <component name="bt_plat" filter="s60" class="api">
- <unit bldFile="os/bt/bt_plat/group"/>
- </component>
<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>
</block>
<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
+ <collection name="usb_plat" long-name="USB Platform Interfaces" level="app-if">
+ <component name="usb_audio_stream_plugin_api" long-name="USB Audio Stream Plugin API" filter="s60" class="api">
+ <unit bldFile="os/usb/usb_plat/usb_audio_stream_plugin_api/group"/>
+ </component>
+ </collection>
<collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
<!-- usbclientdrivers to be moved here from kernelhwsrv-->
</collection>
@@ -1302,15 +1824,253 @@
</component>
</collection>
<collection name="usb_info" long-name="USB Info" level="app-if">
- <component name="usb_plat" filter="s60" long-name="USB Platform Interfaces" class="api">
- <unit bldFile="os/usb/usb_plat/group"/>
- </component>
<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" long-name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
+ <collection name="mm_pub" long-name="Multimedia Public Interfaces" level="app-if">
+ <component name="audio_effects_api" long-name="Audio Effects API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_pub/audio_effects_api/group"/>
+ </component>
+ <component name="audio_effects_presets_api" long-name="Audio Effects Presets API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_pub/audio_effects_presets_api/group"/>
+ </component>
+ <component name="drm_audio_player_api" long-name="DRM Audio Player API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_pub/drm_audio_player_api/group"/>
+ </component>
+ <component name="multimedia_extension_interfaces_api" long-name="Multimedia Extension Interfaces API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_pub/multimedia_extension_interfaces_api/group"/>
+ </component>
+ </collection>
+ <collection name="mm_plat" long-name="Multimedia Platform Interfaces" level="app-if">
+ <component name="aac_decoder_config_api" long-name="AAC Decoder Config API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/aac_decoder_config_api/group"/>
+ </component>
+ <component name="aac_decoder_config_msg_hdlr_api" long-name="AAC Decoder Config Msg Hdlr API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/aac_decoder_config_msg_hdlr_api/group"/>
+ </component>
+ <component name="aac_decoder_config_proxy_api" long-name="AAC Decoder Config Proxy API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
+ </component>
+ <component name="added_devsound_control_api" long-name="Added DevSound Control API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/added_devsound_control_api/group"/>
+ </component>
+ <component name="added_devsound_control_msg_hdlr_api" long-name="Added DevSound Control Msg Hdlr API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
+ </component>
+ <component name="added_devsound_control_proxy_api" long-name="Added DevSound Control Proxy API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
+ </component>
+ <component name="audio_effects_msg_hdlr_api" long-name="Audio Effects Message Handler API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
+ </component>
+ <component name="audio_effects_proxy_api" long-name="Audio Effects Proxy API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/audio_effects_proxy_api/group"/>
+ </component>
+ <component name="audio_policy_header_api" long-name="Audio Policy Header API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/audio_policy_header_api/group"/>
+ </component>
+ <component name="audio_routing_api" long-name="Audio Routing API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/audio_routing_api/group"/>
+ </component>
+ <component name="audio_routing_msg_hdlr_api" long-name="Audio Routing Msg Hdlr API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/audio_routing_msg_hdlr_api/group"/>
+ </component>
+ <component name="audio_routing_proxy_api" long-name="Audio Routing Proxy API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/audio_routing_proxy_api/group"/>
+ </component>
+ <component name="custom_interface_builder_api" long-name="Custom Interface Builder API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/custom_interface_builder_api/group"/>
+ </component>
+ <component name="custom_interface_message_handler_factory_api" long-name="Custom Interface Message Handler Factory API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
+ </component>
+ <component name="custom_interface_proxy_factory_api" long-name="Custom Interface Proxy Factory API" filter="s60" 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" 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" class="api">
+ <unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
+ </component>
+ <component name="display_posting_api" long-name="Display Posting API" filter="s60" 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" class="api">
+ <unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_api/group"/>
+ </component>
+ <component name="eaac_plus_decoder_interface_msg_hdlr_api" long-name="eAAC Plus Decoder Interface Message Handler API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_msg_hdlr_api/group"/>
+ </component>
+ <component name="eaac_plus_decoder_interface_proxy_api" long-name="eAAC Plus Decoder Interface Proxy API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_proxy_api/group"/>
+ </component>
+ <component name="error_concealment_interface_api" long-name="Error Concealment Interface API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/error_concealment_interface_api/group"/>
+ </component>
+ <component name="error_concealment_interface_msg_hdlr_api" long-name="Error Concealment Interface Message Handler API" filter="s60" 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" 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" class="api">
+ <unit bldFile="os/mm/mm_plat/fm_radio_adaptation_api/group"/>
+ </component>
+ <component name="g711_decoder_interface_api" long-name="G711 Decoder Interface API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/g711_decoder_interface_api/group"/>
+ </component>
+ <component name="g711_decoder_interface_msg_hdlr_api" long-name="G711 Decoder Interface Message Handler API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/g711_decoder_interface_msg_hdlr_api/group"/>
+ </component>
+ <component name="g711_decoder_interface_proxy_api" long-name="G711 Decoder Interface Proxy API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/g711_decoder_interface_proxy_api/group"/>
+ </component>
+ <component name="g711_encoder_interface_api" long-name="G711 Encoder Interface API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/g711_encoder_interface_api/group"/>
+ </component>
+ <component name="g711_encoder_interface_msg_hdlr_api" long-name="G711 Encoder Interface Message Handler API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/g711_encoder_interface_msg_hdlr_api/group"/>
+ </component>
+ <component name="g711_encoder_interface_proxy_api" long-name="G711 Encoder Interface Proxy API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/g711_encoder_interface_proxy_api/group"/>
+ </component>
+ <component name="g729_decoder_interface_api" long-name="G729 Decoder Interface API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/g729_decoder_interface_api/group"/>
+ </component>
+ <component name="g729_decoder_interface_msg_hdlr_api" long-name="G729 Decoder Interface Message Handler API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/g729_decoder_interface_msg_hdlr_api/group"/>
+ </component>
+ <component name="g729_decoder_interface_proxy_api" long-name="G729 Decoder Interface Proxy API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/g729_decoder_interface_proxy_api/group"/>
+ </component>
+ <component name="g729_encoder_interface_api" long-name="G729 Encoder Interface API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/g729_encoder_interface_api/group"/>
+ </component>
+ <component name="g729_encoder_interface_proxy_api" long-name="G729 Encoder Interface Proxy API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/g729_encoder_interface_proxy_api/group"/>
+ </component>
+ <component name="g729_encoder_interface_msg_hdlr_api" long-name="G729 Encoder Interface Message Handler API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/g729_encoder_interface_msg_hdlr_api/group"/>
+ </component>
+ <component name="global_audio_settings_api" long-name="Global Audio Settings API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/global_audio_settings_api/group"/>
+ </component>
+ <component name="global_audio_settings_definition_api" long-name="Global Audio Settings Definition API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/global_audio_settings_definition_api/group"/>
+ </component>
+ <component name="ilbc_decoder_interface_api" long-name="Ilbc Decoder Interface API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_api/group"/>
+ </component>
+ <component name="ilbc_decoder_interface_msg_hdlr_api" long-name="Ilbc Decoder Interface Message Handler API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_msg_hdlr_api/group"/>
+ </component>
+ <component name="ilbc_decoder_interface_proxy_api" long-name="Ilbc Decoder Interface Proxy API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_proxy_api/group"/>
+ </component>
+ <component name="ilbc_encoder_interface_api" long-name="Ilbc Encoder Interface API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_api/group"/>
+ </component>
+ <component name="ilbc_encoder_interface_msg_hdlr_api" long-name="Ilbc Encoder Interface Message Handler API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_msg_hdlr_api/group"/>
+ </component>
+ <component name="ilbc_encoder_interface_proxy_api" long-name="Ilbc Encoder Interface Proxy API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
+ </component>
+ <component name="mdf_plugin_uids" long-name="MDF Plug-in UIDs" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/mdf_plugin_uids/group"/>
+ </component>
+ <component name="multimedia_fourcc_definitions_api" long-name="Multimedia FourCC Definitions API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
+ </component>
+ <component name="nokia_audio_policy_header_api" long-name="Nokia Audio Policy Header API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
+ </component>
+ <component name="nokia_multimedia_fourcc_definitions_api" long-name="Nokia Multimedia Fourcc Definitions API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/nokia_multimedia_fourcc_definitions_api/group"/>
+ </component>
+ <component name="ra8_decoder_interface_api" long-name="RA8 Decoder Interface API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/ra8_decoder_interface_api/group"/>
+ </component>
+ <component name="ra8_decoder_interface_msg_hdlr_api" long-name="RA8 Decoder Interface Message Handler API" filter="s60" 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" 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" class="api">
+ <unit bldFile="os/mm/mm_plat/rds_adaptation_api/group"/>
+ </component>
+ <component name="restricted_audio_output_api" long-name="Restricted Audio Output API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/restricted_audio_output_api/group"/>
+ </component>
+ <component name="restricted_audio_output_msg_hdlr_api" long-name="Restricted Audio Output Message Handler API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/restricted_audio_output_msg_hdlr_api/group"/>
+ </component>
+ <component name="restricted_audio_output_proxy_api" long-name="Restricted Audio Output Proxy API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/restricted_audio_output_proxy_api/group"/>
+ </component>
+ <component name="sbc_encoder_interface_api" long-name="SBC Encoder Interface API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/sbc_encoder_interface_api/group"/>
+ </component>
+ <component name="sbc_encoder_interface_msg_hdlr_api" long-name="SBC Encoder Interface Message Handler API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/sbc_encoder_interface_msg_hdlr_api/group"/>
+ </component>
+ <component name="sbc_encoder_interface_proxy_api" long-name="SBC Encoder Interface Proxy API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
+ </component>
+ <component name="secure_output_mdf_custom_interface" long-name="Secure Output MDF Custom Interface" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/secure_output_mdf_custom_interface/group"/>
+ </component>
+ <component name="speech_encoder_config_api" long-name="Speech Encoder Config API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/speech_encoder_config_api/group"/>
+ </component>
+ <component name="speech_encoder_config_msg_hdlr_api" long-name="Speech Encoder Config Message Handler API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/speech_encoder_config_msg_hdlr_api/group"/>
+ </component>
+ <component name="speech_encoder_config_proxy_api" long-name="Speech Encoder Config Proxy API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
+ </component>
+ <component name="telephony_audio_routing_client_api" long-name="Telephony Audio Routing Client API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
+ </component>
+ <component name="telephony_audio_routing_manager_api" long-name="Telephony Audio Routing Manager API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
+ </component>
+ <component name="video_buffer_management_mdf_custom_interface" long-name="Video Buffer Management MDF Custom Interface" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
+ </component>
+ <component name="video_decoder_rotation_mdf_custom_interface" long-name="Video Decoder Rotation MDF Custom Interface" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
+ </component>
+ <component name="video_decoder_scaling_mdf_custom_interface" long-name="Video Decoder Scaling MDF Custom Interface" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
+ </component>
+ <component name="video_reclaim_extbuffers_ci" long-name="Video Reclaim Extbuffers Custom Interface" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
+ </component>
+ <component name="video_window_control_custom_interface" long-name="Video Window Control Custom Interface" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/video_window_control_custom_interface/group"/>
+ </component>
+ <component name="wma_decoder_interface_api" long-name="WMA Decoder Interface API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/wma_decoder_interface_api/group"/>
+ </component>
+ <component name="wma_decoder_interface_msg_hdlr_api" long-name="WMA Decoder Interface Message Handler API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/wma_decoder_interface_msg_hdlr_api/group"/>
+ </component>
+ <component name="wma_decoder_interface_proxy_api" long-name="WMA Decoder Interface Proxy API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
+ </component>
+ <component name="eaacplusutil_api" long-name="EAac Plus Util API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/eaacplusutil_api/group"/>
+ </component>
+ <component name="frametable_api" long-name="Frametable API" filter="s60" class="api">
+ <unit bldFile="os/mm/mm_plat/frametable_api/group"/>
+ </component>
+ </collection>
<collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
<component name="drmaudioplayer" filter="s60" long-name="DRM Audio Player">
<unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/>
@@ -1397,12 +2157,6 @@
</component>
</collection>
<collection name="mm_info" long-name="Multimedia Info" level="app-if">
- <component name="mm_plat" filter="s60" long-name="Multimedia Platform Interfaces" class="api">
- <unit bldFile="os/mm/mm_plat/group"/>
- </component>
- <component name="mm_pub" filter="s60" long-name="Multimedia Public Interfaces" class="api">
- <unit bldFile="os/mm/mm_pub/group"/>
- </component>
<component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
<unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
</component>
@@ -1499,6 +2253,31 @@
</collection>
</block>
<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
+ <collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
+ <component name="exif_api" long-name="Exif API" filter="s60" class="api">
+ <unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
+ </component>
+ </collection>
+ <collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
+ <component name="jpeg2000_icl_plugin_api" long-name="JPEG2000 ICL plugin API" filter="s60" class="api">
+ <unit bldFile="os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
+ </component>
+ <component name="extended_icl_jpeg_api" long-name="Extended ICL Jpeg API" filter="s60" class="api">
+ <unit bldFile="os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
+ </component>
+ <component name="h324_annex_k_custom_api" long-name="H324 Annex K Custom API" filter="s60" class="api">
+ <unit bldFile="os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
+ </component>
+ <component name="ecam_orientation_custom_api" long-name="ECam Orientation Custom API" filter="s60" class="api">
+ <unit bldFile="os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
+ </component>
+ <component name="ecam_ui_orientation_override_custom_api" long-name="ECam UI Orientation Override Custom API" filter="s60" class="api">
+ <unit bldFile="os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
+ </component>
+ <component name="ecam_face_tracking_custom_api" long-name="ECam Face Tracking Custom API" filter="s60" class="api">
+ <unit bldFile="os/imagingext/imagingext_plat/ecam_face_tracking_custom_api/group"/>
+ </component>
+ </collection>
<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
@@ -1516,14 +2295,6 @@
<unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
</component>
</collection>
- <collection name="imagingext_info" long-name="Imaging Extensions Info" level="app-if">
- <component name="imagingext_plat" filter="s60" long-name="Imaging Extensions Platform Interfaces" class="api">
- <unit bldFile="os/imagingext/imagingext_plat/group"/>
- </component>
- <component name="imagingext_pub" filter="s60" long-name="Imaging Extensions Public Interfaces" class="api">
- <unit bldFile="os/imagingext/imagingext_pub/group"/>
- </component>
- </collection>
</block>
<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
@@ -1574,11 +2345,12 @@
<unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
</component>
</collection>
- <collection name="graphics_info" long-name="Graphics Info" level="app-if">
+ <collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
<component name="m3g_core_api" filter="sf_build" long-name="M3G Core API" class="api">
<unit bldFile="os/graphics/graphics_plat/m3g_core_api/group"/>
- <!-- cope with missing graphics_plat/group -->
- </component>
+ </component>
+ </collection>
+ <collection name="graphics_info" long-name="Graphics Info" level="app-if">
<component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
<unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
</component>
@@ -1672,6 +2444,22 @@
<collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if"/>
</block>
<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
+ <collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
+ <component name="findutil_api" long-name="Find Utility API" filter="s60" class="api">
+ <unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
+ </component>
+ <component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
+ <unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
+ </component>
+ <component name="sortutil_api" long-name="Sorting Utility API" filter="s60" class="api">
+ <unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
+ </component>
+ </collection>
+ <collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
+ <component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
+ <unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
+ </component>
+ </collection>
<collection name="charconvfw" long-name="Character Conversion" level="encoding">
<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
<unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
@@ -1747,18 +2535,29 @@
</component>
</collection>
<collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
- <component name="textandloc_pub" filter="s60" long-name="Text and Localisation Public Interfaces" class="api">
- <unit bldFile="os/textandloc/textandloc_pub/group"/>
- </component>
- <component name="textandloc_plat" filter="s60" long-name="Text and Localisation Platform Interfaces" class="api">
- <unit bldFile="os/textandloc/textandloc_plat/group"/>
- </component>
<component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
<unit mrp="os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
</component>
</collection>
</block>
<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
+ <collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
+ <component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
+ <!-- need to fix the configuration used here.
+ Either destribute to other components or use the new feature flags confguration mechanisms.
+ Remove this component and uncomment the other units when fixed-->
+ <unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
+ </component>
+ <component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api">
+ <!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
+ </component>
+ <component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api">
+ <!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
+ </component>
+ <component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api">
+ <!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
+ </component>
+ </collection>
<collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
<component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
<unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
@@ -1797,9 +2596,6 @@
</component>
</collection>
<collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
- <component name="xmlsrv_plat" filter="s60" long-name="XML Services Platform Interfaces" class="api">
- <unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
- </component>
<component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="^2" purpose="development" class="config PC">
<unit mrp="os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
</component>
@@ -2025,10 +2821,6 @@
</component>
</collection>
<collection name="osrndtools_info" long-name="OS R&D tools Info" level="trace">
- <component name="osrndtools_plat" filter="s60" long-name="OS R&D tools Platform Interfaces" purpose="development" class="api">
- <unit bldFile="os/osrndtools/osrndtools_plat/group"/>
- <!-- currently empty. Remove? -->
- </component>
<component name="osrndtools_metadata" long-name="OS R&D tools Metadata" introduced="^2" purpose="development" class="config PC">
<unit mrp="os/osrndtools/osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
</component>
@@ -2037,6 +2829,106 @@
</layer>
<layer name="mw" long-name="Middleware" levels="generic specific">
<block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
+ <collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
+ <component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" class="api">
+ <unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
+ </component>
+ <component name="network_status_api" long-name="Network Status API" filter="s60" class="api">
+ <unit bldFile="mw/appsupport/appsupport_pub/network_status_api/group"/>
+ </component>
+ </collection>
+ <collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
+ <component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" class="api">
+ <unit bldFile="mw/appsupport/appsupport_plat/action_plugin_api/group"/>
+ </component>
+ <component name="application_orientation_api" long-name="Application Orientation API" filter="s60" class="api">
+ <unit bldFile="mw/appsupport/appsupport_plat/application_orientation_api/group"/>
+ </component>
+ <component name="context_access_api" long-name="Context Access API" filter="s60" class="api">
+ <unit bldFile="mw/appsupport/appsupport_plat/context_access_api/group"/>
+ </component>
+ <component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" class="api">
+ <unit bldFile="mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
+ </component>
+ <component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" class="api">
+ <unit bldFile="mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
+ </component>
+ <component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" class="api">
+ <unit bldFile="mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
+ </component>
+ <component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" class="api">
+ <unit bldFile="mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
+ </component>
+ <component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" class="api">
+ <unit bldFile="mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
+ </component>
+ <component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" class="api">
+ <unit bldFile="mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
+ </component>
+ <component name="context_subscription_api" long-name="Context Subscription API" filter="s60" class="api">
+ <unit bldFile="mw/appsupport/appsupport_plat/context_subscription_api/group"/>
+ </component>
+ <component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" class="api">
+ <unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
+ </component>
+ <component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" class="api">
+ <unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
+ </component>
+ <component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" class="api">
+ <unit bldFile="mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
+ </component>
+ <component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" class="api">
+ <unit bldFile="mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
+ </component>
+ <component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" class="api">
+ <unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
+ </component>
+ <component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" class="api">
+ <unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
+ </component>
+ <component name="operation_provider_api" long-name="Operation Provider API" filter="s60" class="api">
+ <unit bldFile="mw/appsupport/appsupport_plat/operation_provider_api/group"/>
+ </component>
+ <component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" class="api">
+ <unit bldFile="mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
+ </component>
+ <component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" class="api">
+ <unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
+ </component>
+ <component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" class="api">
+ <unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
+ </component>
+ <component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" class="api">
+ <unit bldFile="mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
+ </component>
+ <component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" class="api">
+ <unit bldFile="mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
+ </component>
+ <component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" class="api">
+ <unit bldFile="mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
+ </component>
+ <component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" class="api">
+ <unit bldFile="mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
+ </component>
+ <component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" class="api">
+ <unit bldFile="mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
+ </component>
+ <component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" class="api">
+ <unit bldFile="mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
+ </component>
+ <component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" class="api">
+ <unit bldFile="mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
+ </component>
+ <component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" class="api">
+ <unit bldFile="mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
+ </component>
+ <component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" class="api">
+ <unit bldFile="mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
+ </component>
+ <component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" class="api">
+ <unit bldFile="mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
+ </component>
+ </collection>
<collection name="contextframework" long-name="Context Framework" level="framework">
<!-- the units that are commented out need to be put back when configuration is in place.
They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
@@ -2169,6 +3061,9 @@
<component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
<unit bldFile="mw/appsupport/tzservices/tzlocrscfactory/group" mrp="mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
</component>
+ <component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
+ <unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
+ </component>
</collection>
<collection name="contenthandling" long-name="Content Handling" level="plugin">
<component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
@@ -2210,18 +3105,68 @@
</component>
</collection>
<collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
- <component name="appsupport_plat" filter="s60" long-name="Generic Application Support Platform Interfaces" class="api">
- <unit bldFile="mw/appsupport/appsupport_plat/group"/>
- </component>
- <component name="appsupport_pub" filter="s60" long-name="Generic Application Support Public Interfaces" class="api">
- <unit bldFile="mw/appsupport/appsupport_pub/group"/>
- </component>
<component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="^2" purpose="development" class="config PC">
<unit mrp="mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
</component>
</collection>
</block>
<block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
+ <collection name="secsrv_plat" long-name="Security Services Platform Interfaces" level="specific">
+ <component name="cms_api" long-name="CMS API" filter="s60" class="api">
+ <unit bldFile="mw/securitysrv/secsrv_plat/cms_api/group"/>
+ </component>
+ <component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60" class="api">
+ <unit bldFile="mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
+ </component>
+ <component name="java_utils_api" long-name="Java Utils API" filter="s60" class="api">
+ <unit bldFile="mw/securitysrv/secsrv_plat/java_utils_api/group"/>
+ </component>
+ <component name="wim_cert_api" long-name="WIM Cert API" filter="s60" class="api">
+ <unit bldFile="mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
+ </component>
+ <component name="device_key_store_encryption_plugin_api" long-name="Device Key Store Encryption Plug-in API" filter="s60" class="api">
+ <unit bldFile="mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
+ </component>
+ <component name="x509certnameparser_api" long-name="X.509 Certificate Name Parser API" filter="s60" class="api">
+ <unit bldFile="mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
+ </component>
+ <component name="remote_lock_api" long-name="Remote Lock API" filter="s60" class="api">
+ <unit bldFile="mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
+ </component>
+ <component name="pkidialog_api" long-name="PKI Dialog API" filter="s60" class="api">
+ <unit bldFile="mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
+ </component>
+ <component name="provisioning_api" long-name="Provisioning API" filter="s60" class="api">
+ <unit bldFile="mw/securitysrv/secsrv_plat/provisioning_api/group"/>
+ </component>
+ <component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60" class="api">
+ <unit bldFile="mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
+ </component>
+ <component name="keylock_policy_api" long-name="Keylock Policy API" filter="s60" class="api">
+ <unit bldFile="mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
+ </component>
+ <component name="security_code_ui_api" long-name="Security Code UI API" filter="s60" class="api">
+ <unit bldFile="mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
+ </component>
+ <component name="gba_api" long-name="GBA API" filter="s60" class="api">
+ <unit bldFile="mw/securitysrv/secsrv_plat/gba_api/group"/>
+ </component>
+ <component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60" class="api">
+ <unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
+ </component>
+ <component name="devicelock_access_api" long-name="Device Lock Access API" filter="s60" class="api">
+ <unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
+ </component>
+ <component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" 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" class="api">
+ <unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
+ </component>
+ <component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
+ <unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
+ </component>
+ </collection>
<collection name="cms" long-name="Certificate Management Service" level="server">
<!-- collection is really a component. Need to move down a directory-->
<component name="cms_build" filter="s60" long-name="CMS" introduced="^3">
@@ -2339,15 +3284,67 @@
</component>
</collection>
<collection name="securitysrv_info" long-name="Security Services Info" level="specific">
- <component name="secsrv_plat" long-name="Security Services Platform Interfaces" filter="s60" class="api">
- <unit bldFile="mw/securitysrv/secsrv_plat/group"/>
- </component>
<component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
<unit mrp="mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
</component>
</collection>
</block>
<block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
+ <collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
+ <component name="roap_api" long-name="ROAP API" filter="s60" class="api">
+ <unit bldFile="mw/drm/drm_plat/roap_api/group"/>
+ </component>
+ <component name="drm_common_api" long-name="DRM Common API" filter="s60" class="api">
+ <unit bldFile="mw/drm/drm_plat/drm_common_api/group"/>
+ </component>
+ <component name="drm_rights_api" long-name="DRM Rights API" filter="s60" class="api">
+ <unit bldFile="mw/drm/drm_plat/drm_rights_api/group"/>
+ </component>
+ <component name="drm_legacy_api" long-name="DRM Legacy API" filter="s60" class="api">
+ <unit bldFile="mw/drm/drm_plat/drm_legacy_api/group"/>
+ </component>
+ <component name="dcf_repository_api" long-name="DCF Repository API" filter="s60" class="api">
+ <unit bldFile="mw/drm/drm_plat/dcf_repository_api/group"/>
+ </component>
+ <component name="drm_service_api" long-name="DRM Service API" filter="s60" class="api">
+ <unit bldFile="mw/drm/drm_plat/drm_service_api/group"/>
+ </component>
+ <component name="drm_secondary_display_api" long-name="DRM Secondary Display API" filter="s60" class="api">
+ <unit bldFile="mw/drm/drm_plat/drm_secondary_display_api/group"/>
+ </component>
+ <component name="drm_license_manager_api" long-name="DRM License Manager API" filter="s60" class="api">
+ <unit bldFile="mw/drm/drm_plat/drm_license_manager_api/group"/>
+ </component>
+ <component name="drm_utility_api" long-name="DRM Utility API" filter="s60" class="api">
+ <unit bldFile="mw/drm/drm_plat/drm_utility_api/group"/>
+ </component>
+ <component name="drm_agents_api" long-name="DRM Agents API" filter="s60" class="api">
+ <unit bldFile="mw/drm/drm_plat/drm_agents_api/group"/>
+ </component>
+ <component name="wmdrm_core_api" long-name="WM DRM Core API" filter="s60" class="api">
+ <unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
+ </component>
+ <component name="wmdrm_access_api" long-name="WMDRM Access API" filter="s60" class="api">
+ <unit bldFile="mw/drm/drm_plat/wmdrm_access_api/group"/>
+ </component>
+ <component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
+ <unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
+ </component>
+ <component name="camese_framework_api" long-name="Camese Framework API" filter="s60" class="api">
+ <unit bldFile="mw/drm/drm_plat/camese_framework_api/group"/>
+ </component>
+ </collection>
+ <collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
+ <component name="drm_helper_api" long-name="DRM Helper API" filter="s60" class="api">
+ <unit bldFile="mw/drm/drm_pub/drm_helper_api/group"/>
+ </component>
+ <component name="oma_drm_caf_agent_api" long-name="OMA DRM CAF Agent API" filter="s60" class="api">
+ <unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
+ </component>
+ <component name="drm_license_checker_api" long-name="DRM License Checker API" filter="s60" class="api">
+ <unit bldFile="mw/drm/drm_pub/drm_license_checker_api/group"/>
+ </component>
+ </collection>
<collection name="commondrm" long-name="Common DRM" level="generic">
<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
<component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
@@ -2389,16 +3386,97 @@
<unit bldFile="mw/drm/wmdrm/group"/>
</component>
</collection>
- <collection name="drm_info" long-name="DRM Info" level="specific">
- <component name="drm_pub" filter="s60" long-name="DRM Public Interfaces" class="api">
- <unit bldFile="mw/drm/drm_pub/group"/>
- </component>
- <component name="drm_plat" filter="s60" long-name="DRM Platform Interfaces" class="api">
- <unit bldFile="mw/drm/drm_plat/group"/>
- </component>
- </collection>
+ <collection name="drm_info" long-name="DRM Info" level="specific"/>
</block>
<block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
+ <collection name="locsrv_pub" long-name="Location Services Public Interfaces" level="if">
+ <component name="landmarks_search_api" long-name="Landmarks Search API" filter="s60" class="api">
+ <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
+ </component>
+ <component name="landmarks_api" long-name="Landmarks API" filter="s60" class="api">
+ <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/group"/>
+ </component>
+ <component name="landmarks_database_management_api" long-name="Landmarks Database Management API" filter="s60" class="api">
+ <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
+ </component>
+ <component name="location_triggering_api" long-name="Location Triggering API" filter="s60" class="api">
+ <unit bldFile="mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
+ </component>
+ <component name="blid_application_satellite_info_api" long-name="BLID Application Satellite Info API" filter="s60" class="api">
+ <unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
+ </component>
+ </collection>
+ <collection name="locsrv_plat" long-name="Location Services Platform Interfaces" level="if">
+ <component name="map_and_navigation_api" long-name="Map and Navigation API" filter="s60" class="api">
+ <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
+ </component>
+ <component name="map_and_navigation_provider_discovery_api" long-name="Map and Navigation Provider Discovery API" filter="s60" class="api">
+ <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
+ </component>
+ <component name="geocoding_api" long-name="Geocoding API" filter="s60" class="api">
+ <unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
+ </component>
+ <component name="map_image_api" long-name="Map Image API" filter="s60" class="api">
+ <unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/group"/>
+ </component>
+ <component name="map_and_navigation_aiw_api" long-name="Map and Navigation AIW API" filter="s60" class="api">
+ <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
+ </component>
+ <component name="map_and_navigation_provider_api" long-name="Map and Navigation Provider API" filter="s60" class="api">
+ <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
+ </component>
+ <component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
+ <unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
+ </component>
+ <component name="supl_settings_api" long-name="SUPL Settings API" filter="s60" class="api">
+ <unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
+ </component>
+ <component name="location_settings_launch_api" long-name="Location Settings Launch API" filter="s60" class="api">
+ <unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
+ </component>
+ <component name="map_image_conversion_plugin_api" long-name="Map Image Conversion Plug-In API" filter="s60" class="api">
+ <unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
+ </component>
+ <component name="psy_configuration_ui_plugin_api" long-name="PSY Configuration UI Plug-in API" filter="s60" class="api">
+ <unit bldFile="mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
+ </component>
+ <component name="np_proxy_configuration_api" long-name="NP Proxy Configuration API" filter="s60" class="api">
+ <unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
+ </component>
+ <component name="supl_terminal_initiation_api" long-name="SUPL Terminal Initiation API" filter="s60" class="api">
+ <unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
+ </component>
+ <component name="location_notation_preferences_settings_api" long-name="Location Notation Preferences Settings API" filter="s60" class="api">
+ <unit bldFile="mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
+ </component>
+ <component name="supl_settings_notifier_secondary_display_api" long-name="SUPL Settings Notifier Secondary Display API" filter="s60" class="api">
+ <unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
+ </component>
+ <component name="supl_network_initiation_api" long-name="SUPL Network Initiation API" filter="s60" class="api">
+ <unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
+ </component>
+ <component name="privacy_notifiers_secondary_display_api" long-name="Privacy Notifiers Secondary Display API" filter="s60" class="api">
+ <unit bldFile="mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
+ </component>
+ <component name="oma_supl_configuration_parameter_api" long-name="OMA SUPL Configuration Parameter API" filter="s60" class="api">
+ <unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
+ </component>
+ <component name="supl_query_secondary_display_api" long-name="SUPL Query Secondary Display API" filter="s60" class="api">
+ <unit bldFile="mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
+ </component>
+ <component name="location_triggering_management_api" long-name="Location Triggering Management API" filter="s60" class="api">
+ <unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
+ </component>
+ <component name="location_triggering_status_information_api" long-name="Location Triggering Status Information API" filter="s60" class="api">
+ <unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
+ </component>
+ <component name="oma_supl_asn_codec_plugin_api" long-name="OMA SUPL ASN Codec Plugin API" filter="s60" class="api">
+ <unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
+ </component>
+ <component name="location_local_variation_api" long-name="Location Local Variation API" filter="s60" class="api">
+ <unit bldFile="mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
+ </component>
+ </collection>
<collection name="genericpositioningplugins" long-name="Generic Positioning Plugins" level="plugin">
<component name="locationnpppsy" filter="s60" long-name="Location Positioning Proxy PSY" plugin="Y">
<unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
@@ -2483,16 +3561,52 @@
<unit bldFile="mw/locationsrv/locationtriggering/group"/>
</component>
</collection>
- <collection name="locationsrv_info" long-name="Location Services Info" level="if">
- <component name="locsrv_plat" filter="s60" long-name="Location Services Platform Interfaces" class="api">
- <unit bldFile="mw/locationsrv/locsrv_plat/group"/>
- </component>
- <component name="locsrv_pub" filter="s60" long-name="Location Services Public Interfaces" class="api">
- <unit bldFile="mw/locationsrv/locsrv_pub/group"/>
- </component>
- </collection>
</block>
<block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
+ <collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
+ <component name="wapi_security_settings_ui_api" long-name="WAPI Security Settings UI API" filter="s60" class="api">
+ <unit bldFile="mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
+ </component>
+ <component name="wep_security_settings_ui_api" long-name="WEP Security Settings UI API" filter="s60" class="api">
+ <unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
+ </component>
+ <component name="wi-fi_protected_setup_ui_api" long-name="Wi-Fi Protected Setup UI API" filter="s60" class="api">
+ <unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
+ </component>
+ <component name="wlan_eap_settings_ui_api" long-name="WLAN EAP Settings UI API" filter="s60" class="api">
+ <unit bldFile="mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
+ </component>
+ <component name="wpa_security_settings_ui_api" long-name="WPA Security Settings UI API" filter="s60" class="api">
+ <unit bldFile="mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
+ </component>
+ <component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
+ <unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
+ </component>
+ <component name="eapsim_db_api" long-name="EAP-SIM DB API" filter="s60" class="api">
+ <unit bldFile="mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
+ </component>
+ <component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
+ <unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
+ </component>
+ <component name="eaptlspeap_db_api" long-name="EAP-TLS-PEAP DB API" filter="s60" class="api">
+ <unit bldFile="mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
+ </component>
+ <component name="eapleap_db_api" long-name="LEAP DB API" filter="s60" class="api">
+ <unit bldFile="mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
+ </component>
+ <component name="eapgtc_db_api" long-name="EAP-GTC DB API" filter="s60" class="api">
+ <unit bldFile="mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
+ </component>
+ <component name="eapmschapv2_db_api" long-name="EAP-MSCHAPV2 DB API" filter="s60" class="api">
+ <unit bldFile="mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
+ </component>
+ <component name="eapaka_db_api" long-name="EAP-AKA DB API" filter="s60" class="api">
+ <unit bldFile="mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
+ </component>
+ <component name="wapi_db_api" long-name="WAPI DB API" filter="s60" class="api">
+ <unit bldFile="mw/accesssec/accesssec_plat/wapi_db_api/group"/>
+ </component>
+ </collection>
<collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
<component name="wapisecuritysettingsui" filter="s60" long-name="WAPI Security Settings UI" introduced="9.1">
<!-- the directory for this needs to be moved up to the right level -->
@@ -2516,13 +3630,72 @@
<unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
</component>
</collection>
- <collection name="accesssec_info" long-name="Access Security Info" level="specific">
- <component name="accesssec_plat" filter="s60" long-name="Access Security Platform Interfaces" class="api">
- <unit bldFile="mw/accesssec/accesssec_plat/group"/>
- </component>
- </collection>
</block>
<block name="ipconnmgmt" level="generic" long-name="IP Connectivity Management" levels="plugin framework server generic utils">
+ <collection name="ipcm_plat" long-name="IP Connectivity Management Platform Interfaces" level="utils">
+ <component name="access_point_engine_misc_api" long-name="Access Point Engine Misc API" filter="s60" class="api">
+ <unit bldFile="mw/ipconnmgmt/ipcm_plat/access_point_engine_misc_api/group"/>
+ </component>
+ <component name="bearer_settings_plugin_api" long-name="Bearer Settings Plugin API" filter="s60" class="api">
+ <unit bldFile="mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
+ </component>
+ <component name="commsdat_wlan_api" long-name="CommsDat WLAN API" filter="s60" class="api">
+ <unit bldFile="mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
+ </component>
+ <component name="connection_monitor_extension_api" long-name="Connection Monitor Extension API" filter="s60" class="api">
+ <unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
+ </component>
+ <component name="connection_ui_utilities_api" long-name="Connection UI Utilities API" filter="s60" class="api">
+ <unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
+ </component>
+ <component name="disconnect_dialog_api" long-name="Disconnect Dialog API" filter="s60" class="api">
+ <unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
+ </component>
+ <component name="disconnect_dialog_disable_api" long-name="Disconnect Dialog Disable API" filter="s60" class="api">
+ <unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
+ </component>
+ <component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" class="api">
+ <unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
+ </component>
+ <component name="mpm_default_connection_api" long-name="MPM Default Connection API" filter="s60" class="api">
+ <unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
+ </component>
+ <component name="pdpcontextmanager2_reset_factory_settings_api" long-name="PDP Context Manager 2 Reset Factory Settings API" filter="s60" class="api">
+ <unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_reset_factory_settings_api/group"/>
+ </component>
+ <component name="pdpcontextmanager2_settings_api" long-name="PDP Context Manager 2 Settings API" filter="s60" class="api">
+ <unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
+ </component>
+ <component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" class="api">
+ <unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_connect_screen_api/group"/>
+ </component>
+ </collection>
+ <collection name="ipcm_pub" long-name="IP Connectivity Management Public Interfaces" level="utils">
+ <component name="connection_settings_api" long-name="Connection Settings API" filter="s60" class="api">
+ <unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_api/group"/>
+ </component>
+ <component name="access_point_engine_api" long-name="Access Point Engine API" filter="s60" class="api">
+ <unit bldFile="mw/ipconnmgmt/ipcm_pub/access_point_engine_api/group"/>
+ </component>
+ <component name="access_point_settings_handler_api" long-name="Access Point Settings Handler API" filter="s60" class="api">
+ <unit bldFile="mw/ipconnmgmt/ipcm_pub/access_point_settings_handler_api/group"/>
+ </component>
+ <component name="data_connection_log_counters_api" long-name="Data Connection Log Counters API" filter="s60" class="api">
+ <unit bldFile="mw/ipconnmgmt/ipcm_pub/data_connection_log_counters_api/group"/>
+ </component>
+ <component name="connection_monitor_server_api" long-name="Connection Monitor Server API" filter="s60" class="api">
+ <unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
+ </component>
+ <component name="connection_settings_ui_api" long-name="Connection Settings UI API" filter="s60" class="api">
+ <unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
+ </component>
+ <component name="agent_dialog_api" long-name="Agent Dialog API" filter="s60" class="api">
+ <unit bldFile="mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
+ </component>
+ <component name="extendedconnpref_api" long-name="Extended Connection Preferences API" filter="s60" class="api">
+ <unit bldFile="mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
+ </component>
+ </collection>
<collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
<component name="apcontrollistplugin" filter="s60" long-name="Access Point Control List Plugin" introduced="^2" plugin="Y">
<unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
@@ -2604,12 +3777,6 @@
</component>
</collection>
<collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="utils">
- <component name="ipcm_pub" filter="s60" long-name="IP Connectivity Management Public Interfaces" class="api">
- <unit bldFile="mw/ipconnmgmt/ipcm_pub/group"/>
- </component>
- <component name="ipcm_plat" filter="s60" long-name="IP Connectivity Management Platform Interfaces" class="api">
- <unit bldFile="mw/ipconnmgmt/ipcm_plat/group"/>
- </component>
<component name="ipcm_build" filter="s60" long-name="IP Connectivity Management Build">
<!-- need to move exports to another component, or maek this a config component and revmove the #includes -->
<unit bldFile="mw/ipconnmgmt/group"/>
@@ -2617,6 +3784,17 @@
</collection>
</block>
<block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
+ <collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
+ <component name="cookie_manager_api" long-name="Cookie Manager API" filter="s60" class="api">
+ <unit bldFile="mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
+ </component>
+ <component name="http_cache_mgr_api" long-name="HTTP Cache Manager API" filter="s60" class="api">
+ <unit bldFile="mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
+ </component>
+ <component name="http_filters_api" long-name="HTTP Filters API" filter="s60" class="api">
+ <unit bldFile="mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
+ </component>
+ </collection>
<collection name="httpfilters" long-name="HTTP Filters" level="plugin">
<component name="httpfiltercommon" filter="s60" long-name="HTTP Filter Common">
<unit bldFile="mw/netprotocols/httpfilters/httpfiltercommon/group"/>
@@ -2684,15 +3862,20 @@
</component>
</collection>
<collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
- <component name="netprotocols_plat" filter="s60" long-name="High-level Internet Protocols Platform Interfaces" class="api">
- <unit bldFile="mw/netprotocols/netprotocols_plat/group"/>
- </component>
<component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="^2" purpose="development" class="config PC">
<unit mrp="mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
</component>
</collection>
</block>
<block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
+ <collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="if">
+ <component name="srtp_api" long-name="SRTP API" filter="s60" class="api">
+ <unit bldFile="mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
+ </component>
+ <component name="rtprtcp_api" long-name="RTP/RTCP API" filter="s60" class="api">
+ <unit bldFile="mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
+ </component>
+ </collection>
<collection name="rtp" long-name="RTP" level="server">
<component name="srtpstack" filter="s60" long-name="SRTP Stack">
<unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/>
@@ -2733,15 +3916,26 @@
</component>
</collection>
<collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
- <component name="ipappprotocols_plat" filter="s60" long-name="IP App Protocols Platform Interfaces" class="api">
- <unit bldFile="mw/ipappprotocols/ipappprotocols_plat/group"/>
- </component>
<component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="^2" purpose="development" class="config PC">
<unit mrp="mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
</component>
</collection>
</block>
<block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
+ <collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
+ <component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
+ <unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
+ </component>
+ <component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" class="api">
+ <unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
+ </component>
+ <component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" class="api">
+ <unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
+ </component>
+ <component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" class="api">
+ <unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
+ </component>
+ </collection>
<collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
<component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
@@ -2784,14 +3978,14 @@
<unit bldFile="mw/wirelessacc/wlanutilities/wlanindicatorplugin/group"/>
</component>
</collection>
- <collection name="wirelessacc_info" long-name="Wireless Access Info" level="ui">
- <component name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" filter="s60" class="api">
- <unit bldFile="mw/wirelessacc/hsfw_plat/group"/>
- </component>
- </collection>
</block>
<block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
<!-- is the !oem_build filter needed? -->
+ <collection name="vpnc_plat" long-name="VPN Client Platform Interfaces" level="api">
+ <component name="vpnapi" filter="s60" long-name="VPN API" class="api">
+ <unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group" filter="!oem_build"/>
+ </component>
+ </collection>
<collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
<component name="vpnapi" filter="s60" long-name="VPN API">
<unit bldFile="mw/vpnclient/vpnapiimpl/group" filter="!oem_build"/>
@@ -2911,12 +4105,29 @@
<!-- should split this up into the other components and remove this-->
<unit bldFile="mw/vpnclient/group" filter="!oem_build"/>
</component>
- <component name="vpnc_plat" filter="s60" long-name="VPN Client Platform Interfaces" class="api">
- <unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group" filter="!oem_build"/>
- </component>
</collection>
</block>
<block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
+ <collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
+ <component name="transcoder_api" long-name="Transcoder API" filter="s60" class="api">
+ <unit bldFile="mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
+ </component>
+ <component name="comms_event_api" long-name="Comms Event API" filter="s60" class="api">
+ <unit bldFile="mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
+ </component>
+ <component name="floor_control_api" long-name="Floor Control API" filter="s60" class="api">
+ <unit bldFile="mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
+ </component>
+ <component name="media_control_api" long-name="Media Control API" filter="s60" class="api">
+ <unit bldFile="mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
+ </component>
+ <component name="multimedia_comms_api" long-name="Multimedia Comms API" filter="s60" class="api">
+ <unit bldFile="mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
+ </component>
+ <component name="nat_settings_api" long-name="NAT Settings API" filter="s60" class="api">
+ <unit bldFile="mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
+ </component>
+ </collection>
<collection name="natfw" long-name="NAT Framework" level="framework">
<!-- collection is really a component. Need to move down a directory -->
<component name="natfw_build" filter="s60" long-name="NAT Framework Build" introduced="^2">
@@ -2950,9 +4161,6 @@
</component>
</collection>
<collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
- <component name="ipappsrv_plat" filter="s60" long-name="IP App Services Platform Interfaces" class="api">
- <unit bldFile="mw/ipappsrv/ipappsrv_plat/group"/>
- </component>
<component name="ipappsrv_build" long-name="IP App Services Build" filter="s60">
<!-- remove the #includes from here and rename as xxx ROM or move iby/sis files into another component-->
<unit mrp="mw/ipappsrv/group"/>
@@ -2963,6 +4171,122 @@
</collection>
</block>
<block name="phonesrv" level="specific" long-name="Telephony and SIM Services" levels="plugin framework server generic specific">
+ <collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
+ <component name="string_parser_api" long-name="String Parser API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
+ </component>
+ <component name="cbs_mcn_client_api" long-name="CBS MCN Client API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
+ </component>
+ <component name="converged_call_engine_api" long-name="Converged Call Engine API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
+ </component>
+ <component name="aiw_dial_data_consumer_api" long-name="AIW Dial Data Consumer API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
+ </component>
+ <component name="phone_client_ussd_api" long-name="Phone Client USSD API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
+ </component>
+ <component name="sat_refresh_api" long-name="SAT Refresh API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/group" filter="!test"/>
+ </component>
+ <component name="network_handling_engine_api" long-name="Network Handling Engine API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
+ </component>
+ <component name="phone_client_emergency_call_api" long-name="Phone Client Emergency Call API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
+ </component>
+ <component name="sat_configuration_api" long-name="SAT Configuration API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
+ </component>
+ <component name="dial_utils_api" long-name="Dial Utils API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
+ </component>
+ <component name="phone_client_image_handler_api" long-name="Phone Client Image Handler API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
+ </component>
+ <component name="phone_client_messenger_api" long-name="Phone Client Messenger API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
+ </component>
+ <component name="sat_client_api" long-name="SAT Client API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/group" filter="!test"/>
+ </component>
+ <component name="phone_client_api" long-name="Phone Client API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
+ </component>
+ <component name="sat_service_api" long-name="SAT Service API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/sat_service_api/group" filter="!test"/>
+ </component>
+ <component name="cbs_message_api" long-name="CBS Message API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
+ </component>
+ <component name="phone_client_server_information_api" long-name="Phone Client Server Information API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
+ </component>
+ <component name="phone_client_ussd_internal_api" long-name="Phone Client USSD Internal API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
+ </component>
+ <component name="phone_client_command_handler_api" long-name="Phone Client Command Handler API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
+ </component>
+ <component name="phone_client_notify_api" long-name="Phone Client Notify API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
+ </component>
+ <component name="phone_client_utility_api" long-name="Phone Client Utility API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
+ </component>
+ <component name="telephony_network_information_api" long-name="Telephony Network Information API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
+ </component>
+ <component name="secondary_display_sat_api" long-name="Secondary Display SAT API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
+ </component>
+ <component name="callui_reconnect_query_api" long-name="CallUI Reconnect Query API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
+ </component>
+ <component name="service_provider_settings_api" long-name="Service Provider Settings API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
+ </component>
+ <component name="converged_call_provider_api" long-name="Converged Call Provider API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
+ </component>
+ <component name="incoming_call_monitor_api" long-name="Incoming Call Monitor API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
+ </component>
+ <component name="default_emergency_numbers_api" long-name="Default Emergency Numbers API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
+ </component>
+ <component name="cenrep_database_api" long-name="Central Repository Database API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
+ </component>
+ <component name="ss_settings_api" long-name="SS Settings API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
+ </component>
+ <component name="phone_settings_observer_api" long-name="Phone Settings Observer API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
+ </component>
+ <component name="phone_settings_notes_ui_api" long-name="Phone Settings Notes UI API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
+ </component>
+ <component name="phone_settings_api" long-name="Phone Settings API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
+ </component>
+ <component name="voice_mailbox_number_api" long-name="Voice Mailbox Number API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
+ </component>
+ <component name="voice_mailbox_settings_api" long-name="Voice Mailbox Settings API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
+ </component>
+ <component name="call_information_api" long-name="Call Information API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/group" filter="!test"/>
+ </component>
+ <component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
+ </component>
+ <component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
+ <unit bldFile="mw/phonesrv/phonesrv_plat/telephony_mediator_api/group"/>
+ </component>
+ </collection>
<collection name="telutils" long-name="Telephony Utils" level="generic">
<component name="phoneparser" filter="s60" long-name="Phone Parser">
<unit bldFile="mw/phonesrv/telutils/phoneparser/group"/>
@@ -3062,16 +4386,31 @@
<unit bldFile="mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
</component>
</collection>
- <collection name="phonesrv_info" long-name="Telephony and SIM Services Info" level="specific">
- <component name="phonesrv_plat" filter="s60" long-name="Telephony and SIM Services Platform Interfaces" class="api">
- <unit bldFile="mw/phonesrv/phonesrv_plat/group"/>
- </component>
- <component name="phonesrv_pub" filter="s60" long-name="Telephony and SIM Services Public Interfaces" class="api">
- <unit bldFile="mw/phonesrv/phonesrv_pub/group"/>
- </component>
- </collection>
+ <collection name="phonesrv_info" long-name="Telephony and SIM Services Info" level="specific"/>
</block>
<block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack fw api">
+ <collection name="msgfw_pub" long-name="Messaging Middleware Public Interfaces" level="api">
+ <component name="send_ui_api" long-name="Send UI API" filter="s60" class="api">
+ <unit bldFile="mw/messagingmw/msgfw_pub/send_ui_api/group"/>
+ </component>
+ </collection>
+ <collection name="msgfw_plat" long-name="Messaging Middleware Platform Interfaces" level="api">
+ <component name="always_online_plugin_api" long-name="Always Online Plugin API" filter="s60" class="api">
+ <unit bldFile="mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
+ </component>
+ <component name="always_online_client_api" long-name="Always Online Client API" filter="s60" class="api">
+ <unit bldFile="mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
+ </component>
+ <component name="msg_common_utils_api" long-name="Messaging Common Utils API" filter="s60" class="api">
+ <unit bldFile="mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
+ </component>
+ <component name="send_ui_plugin_api" long-name="Send UI Plug-in API" filter="s60" class="api">
+ <unit bldFile="mw/messagingmw/msgfw_plat/send_ui_plugin_api/group"/>
+ </component>
+ <component name="send_ui_datautils_api" long-name="Send UI Data Utils API" filter="s60" class="api">
+ <unit bldFile="mw/messagingmw/msgfw_plat/send_ui_datautils_api/group"/>
+ </component>
+ </collection>
<collection name="msgbranched" long-name="Messaging Branched" level="fw">
<!-- collection is really a component. Need to move down a directory -->
<component name="msgbranched_build" filter="s60" long-name="Messaging Branched Build">
@@ -3124,18 +4463,92 @@
</component>
</collection>
<collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
- <component name="msgfw_plat" filter="s60" long-name="Messaging Middleware Platform Interfaces" class="api">
- <unit bldFile="mw/messagingmw/msgfw_plat/group"/>
- </component>
- <component name="msgfw_pub" filter="s60" long-name="Messaging Middleware Public Interfaces" class="api">
- <unit bldFile="mw/messagingmw/msgfw_pub/group"/>
- </component>
<component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="^2" purpose="development" class="config PC">
<unit mrp="mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
</component>
</collection>
</block>
<block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
+ <collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
+ <component name="ximp_core_data_model_api" long-name="XIMP Core Data Model API" filter="s60" class="api">
+ <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
+ </component>
+ <component name="ximp_presence_protocol_plugin_host_api" long-name="XIMP Presence Protocol Plug-in Host API" filter="s60" class="api">
+ <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
+ </component>
+ <component name="ximp_presence_data_model_api" long-name="XIMP Presence Data Model API" filter="s60" class="api">
+ <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
+ </component>
+ <component name="ximp_presence_protocol_plugin_api" long-name="XIMP Presence Protocol Plug-in API" filter="s60" class="api">
+ <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
+ </component>
+ <component name="ximp_presence_management_api" long-name="XIMP Presence Management API" filter="s60" class="api">
+ <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
+ </component>
+ <component name="ximp_core_protocol_plugin_host_api" long-name="XIMP Core Protocol Plug-in Host API" filter="s60" class="api">
+ <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
+ </component>
+ <component name="ximp_core_management_api" long-name="XIMP Core Management API" filter="s60" class="api">
+ <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
+ </component>
+ <component name="ximp_presence_base_api" long-name="XIMP Presence Base API" filter="s60" class="api">
+ <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
+ </component>
+ <component name="ximp_core_protocol_plugin_api" long-name="XIMP Core Protocol Plug-in API" filter="s60" class="api">
+ <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
+ </component>
+ <component name="ximp_core_base_api" long-name="XIMP Core Base API" filter="s60" class="api">
+ <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
+ </component>
+ <component name="ximp_presence_cache_api" long-name="XIMP Presence Cache API" filter="s60" class="api">
+ <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
+ </component>
+ <component name="ximp_core_feature_plugin_api" long-name="XIMP Core Feature Plugin API" filter="s60" class="api">
+ <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
+ </component>
+ <component name="ximp_im_protocol_plugin_host_api" long-name="XIMP IM Protocol Plugin Host API" filter="s60" class="api">
+ <unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
+ </component>
+ <component name="ximp_im_data_model_api" long-name="XIMP IM Data Model API" filter="s60" class="api">
+ <unit bldFile="mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
+ </component>
+ <component name="ximp_im_protocol_plugin_api" long-name="XIMP IM Protocol Plugin API" filter="s60" class="api">
+ <unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
+ </component>
+ <component name="ximp_im_management_api" long-name="XIMP IM Management API" filter="s60" class="api">
+ <unit bldFile="mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
+ </component>
+ <component name="ximp_im_base_api" long-name="XIMP IM Base API" filter="s60" class="api">
+ <unit bldFile="mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
+ </component>
+ <component name="ximp_search_protocol_plugin_host_api" long-name="XIMP Search Protocol Plugin Host API" filter="s60" class="api">
+ <unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
+ </component>
+ <component name="ximp_search_data_model_api" long-name="XIMP Search Data Model API" filter="s60" class="api">
+ <unit bldFile="mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
+ </component>
+ <component name="ximp_search_protocol_plugin_api" long-name="XIMP search Protocol Plugin API" filter="s60" class="api">
+ <unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
+ </component>
+ <component name="ximp_search_management_api" long-name="XIMP Search Management API" filter="s60" class="api">
+ <unit bldFile="mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
+ </component>
+ <component name="ximp_search_base_api" long-name="XIMP Search Base API" filter="s60" class="api">
+ <unit bldFile="mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
+ </component>
+ <component name="xmpp_settings_api" long-name="XMPP Settings API" filter="s60" class="api">
+ <unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
+ </component>
+ <component name="im_cache_client_api" long-name="IM Cache Client API" filter="s60" class="api">
+ <unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
+ </component>
+ <component name="im_cache_server_api" long-name="IM Cache Server API" filter="s60" class="api">
+ <unit bldFile="mw/imsrv/imsrv_plat/im_cache_server_api/group"/>
+ </component>
+ <component name="presence_avabilitytext" long-name="Presence Avability Text" filter="s60" class="api">
+ <unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
+ </component>
+ </collection>
<collection name="ximpfw" long-name="XIMP Framework" level="framework">
<!-- collection is really a component. Needs to be moved down a directory -->
<component name="ximpfw_build" filter="s60" long-name="XIMP Framework Build">
@@ -3168,13 +4581,49 @@
<unit bldFile="mw/imsrv/brandingserver/group"/>
</component>
</collection>
- <collection name="imsrv_info" long-name="Instant Messaging and Presence Services Info" level="specific">
- <component name="imsrv_plat" filter="s60" long-name="Instant Messaging and Presence Services Platform Interfaces" class="api">
- <unit bldFile="mw/imsrv/imsrv_plat/group"/>
- </component>
- </collection>
</block>
<block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
+ <collection name="pressrv_plat" long-name="Legacy Presence Services Platform Interfaces" level="ui">
+ <component name="presence_list_api" long-name="Presence List API" filter="s60" class="api">
+ <unit bldFile="mw/legacypresence/pressrv_plat/presence_list_api/group"/>
+ </component>
+ <component name="watcher_info_api" long-name="Watcher Info API" filter="s60" class="api">
+ <unit bldFile="mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
+ </component>
+ <component name="simple_documents_api" long-name="SIMPLE Documents API" filter="s60" class="api">
+ <unit bldFile="mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
+ </component>
+ <component name="authorization_api" long-name="Authorization API" filter="s60" class="api">
+ <unit bldFile="mw/legacypresence/pressrv_plat/authorization_api/group"/>
+ </component>
+ <component name="xdm_protocol_plugin_api" long-name="XDM Protocol Plug-in API" filter="s60" class="api">
+ <unit bldFile="mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
+ </component>
+ <component name="watcher_api" long-name="Watcher API" filter="s60" class="api">
+ <unit bldFile="mw/legacypresence/pressrv_plat/watcher_api/group"/>
+ </component>
+ <component name="xdm_api" long-name="XDM API" filter="s60" class="api">
+ <unit bldFile="mw/legacypresence/pressrv_plat/xdm_api/group"/>
+ </component>
+ <component name="registration_api" long-name="Registration API" filter="s60" class="api">
+ <unit bldFile="mw/legacypresence/pressrv_plat/registration_api/group"/>
+ </component>
+ <component name="publisher_api" long-name="Publisher API" filter="s60" class="api">
+ <unit bldFile="mw/legacypresence/pressrv_plat/publisher_api/group"/>
+ </component>
+ <component name="messaging_connection_manager_api" long-name="Messaging Connection Manager API" filter="s60" class="api">
+ <unit bldFile="mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
+ </component>
+ <component name="xdm_settings_api" long-name="XDM Settings API" filter="s60" class="api">
+ <unit bldFile="mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
+ </component>
+ <component name="simple_settings_api" long-name="SIMPLE Settings API" filter="s60" class="api">
+ <unit bldFile="mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
+ </component>
+ <component name="simple_instant_msg_api" long-name="Simple Instant Msg API" filter="s60" class="api">
+ <unit bldFile="mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
+ </component>
+ </collection>
<collection name="xdmengine" long-name="XDM Engine" level="engine">
<!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
<component name="xdmengine_build" filter="s60" long-name="XDM Engine Build">
@@ -3222,13 +4671,13 @@
<unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
</component>
</collection>
- <collection name="legacypresence_info" long-name="Legacy Presence Services Info" level="ui">
- <component name="pressrv_plat" filter="s60" long-name="Legacy Presence Services Platform Interfaces" class="api">
- <unit bldFile="mw/legacypresence/pressrv_plat/group"/>
- </component>
- </collection>
</block>
<block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
+ <collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
+ <component name="messagequeue_api" long-name="Message Queue API" introduced="^2" filter="s60" class="api">
+ <unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/group"/>
+ </component>
+ </collection>
<collection name="loudmouth" long-name="Loudmouth" level="prt">
<!-- collection is really a component so it needs to be moved down a directory -->
<component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
@@ -3259,13 +4708,129 @@
<unit bldFile="mw/opensrv/isolationserver/group"/>
</component>
</collection>
- <collection name="opensrv_info" long-name="Open Services Info" level="eng">
- <component name="opensrv_plat" filter="s60" long-name="Open Services Platform Interfaces" introduced="^2" class="api">
- <unit bldFile="mw/opensrv/opensrv_plat/group"/>
- </component>
- </collection>
</block>
<block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
+ <collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
+ <component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
+ </component>
+ </collection>
+ <collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
+ <component name="common_agent_util_and_definitions_api" long-name="Common Agent util and definitions API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
+ </component>
+ <component name="policy_management_certificate_api" long-name="Policy Management Certificate API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
+ </component>
+ <component name="oma_provisioning_adapter_api" long-name="OMA Provisioning Adapter API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
+ </component>
+ <component name="device_management_parameter_api" long-name="Device Management Parameter API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
+ </component>
+ <component name="data_synchronization_plugin_api" long-name="Data Synchronization Plug-in API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
+ </component>
+ <component name="sync_alert_handler_api" long-name="Sync Alert Handler API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
+ </component>
+ <component name="syncml_notifier_api" long-name="SyncML Notifier API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
+ </component>
+ <component name="syncml_client_api" long-name="SyncML Client API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
+ </component>
+ <component name="device_management_plugin_api" long-name="Device Management plug-in API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
+ </component>
+ <component name="dm_tree_apis" long-name="DM Tree APIs" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
+ </component>
+ <component name="terminal_security_device_lock_api" long-name="Terminal Security Device Lock API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
+ </component>
+ <component name="policy_management_request_api" long-name="Policy Management Request API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
+ </component>
+ <component name="ds_constant_definitions_api" long-name="DS Constant Definitions API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
+ </component>
+ <component name="scp_server_api" long-name="SCP Server API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
+ </component>
+ <component name="data_synchronization_notification_api" long-name="Data Synchronization Notification API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
+ </component>
+ <component name="oma_provisioning_engine_api" long-name="OMA Provisioning Engine API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
+ </component>
+ <component name="dm_utils_api" long-name="DM Utils API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
+ </component>
+ <component name="syncml_alert_api" long-name="SyncML Alert API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
+ </component>
+ <component name="obex_client_session_api" long-name="OBEX Client session API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
+ </component>
+ <component name="setting_enforcement_info_api" long-name="Setting Enforcement Info API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
+ </component>
+ <component name="dm_constant_definitions_api" long-name="DM Constant Definitions API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
+ </component>
+ <component name="oma_ds_extensions_api" long-name="OMA DS Extensions API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
+ </component>
+ <component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
+ </component>
+ <component name="diagnostics_plugin_utility_api" long-name="Diagnostics Plugin Utility API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
+ </component>
+ <component name="diagnostics_plugin_api" long-name="Diagnostics Plug-in API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
+ </component>
+ <component name="diagnostics_framework_api" long-name="Diagnostics Framework API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
+ </component>
+ <component name="diagnostics_results_api" long-name="Diagnostics Results API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
+ </component>
+ <component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
+ </component>
+ <component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
+ </component>
+ <component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
+ </component>
+ <component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
+ </component>
+ <component name="update_package_storage_plugin_api" long-name="Update Package Storage Plug-in API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
+ </component>
+ <component name="syncml_notifier_roaming_api" long-name="SyncML Notifier Roaming API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
+ </component>
+ <component name="sync_service_api" long-name="Sync Service API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
+ </component>
+ <component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
+ </component>
+ <component name="dcmo_control_api" long-name="DCMO Control API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
+ </component>
+ <component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
+ </component>
+ <component name="dm_native_notifier_api" long-name="DM Native Notifier API" filter="s60" class="api">
+ <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_native_notifier_api/group"/>
+ </component>
+ </collection>
<collection name="policymanagement" long-name="Policy Management" level="generic">
<component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
<unit bldFile="mw/remotemgmt/policymanagement/pmdmadapter/group"/>
@@ -3367,16 +4932,13 @@
<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
</component>
</collection>
- <collection name="remotemgmt_info" long-name="Remote Management Info" level="specific">
- <component name="remotemgmt_plat" filter="s60" long-name="Remote Management Platform Interfaces" class="api">
- <unit bldFile="mw/remotemgmt/remotemgmt_plat/group"/>
- </component>
- <component name="remotemgmt_pub" filter="s60" long-name="Remote Management Public Interfaces" class="api">
- <unit bldFile="mw/remotemgmt/remotemgmt_pub/group"/>
- </component>
- </collection>
</block>
<block name="remotestorage" level="generic" long-name="Remote Storage" levels="framework if">
+ <collection name="rsfw_plat" long-name="Remote Storage Platform Interfaces" level="if">
+ <component name="rsfw_access_protocol_plugin_api" filter="s60" long-name="Remote Storage Framework Access Protocol Plugin API" class="api">
+ <unit bldFile="mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
+ </component>
+ </collection>
<collection name="remotestoragefw" long-name="Remote Storage Framework" level="framework">
<component name="mountstore" filter="s60" long-name="RSFW Mount Store">
<unit bldFile="mw/remotestorage/remotestoragefw/mountstore/group"/>
@@ -3410,11 +4972,6 @@
<unit bldFile="mw/remotestorage/remotestoragefw/group"/>
</component>
</collection>
- <collection name="remotestorage_info" long-name="Remote Storage Info" level="if">
- <component name="rsfw_plat" filter="s60" long-name="Remote Storage Platform Interfaces" class="api">
- <unit bldFile="mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
- </component>
- </collection>
</block>
<block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
<collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
@@ -3423,9 +4980,6 @@
</component>
</collection>
<collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
- <component name="remoteconn_plat" filter="s60" long-name="Remote Connectivity Platform Interfaces" class="api">
- <unit bldFile="mw/remoteconn/remoteconn_plat/group"/>
- </component>
<component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="^2" purpose="development" class="config PC">
<unit mrp="mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
</component>
@@ -3475,15 +5029,32 @@
</collection>
</block>
<block name="srvdiscovery" level="generic" long-name="Service Discovery and Usage" levels="plugin framework server generic specific">
+ <collection name="upnpstack_plat" long-name="UPnP Stack Platform Interfaces" level="specific">
+ <component name="upnpstack_plat" long-name="UPnP Device API" purpose="optional" introduced="^3" class="api">
+ <unit bldFile="mw/srvdiscovery/upnp/upnpstack_plat/upnp_device_api/group"/>
+ </component>
+ <component name="upnpstack_plat" long-name="UPnP Common API" purpose="optional" introduced="^3" class="api">
+ <unit bldFile="mw/srvdiscovery/upnp/upnpstack_plat/upnp_common_api/group"/>
+ </component>
+ <component name="upnpstack_plat" long-name="UPnP Utils API" purpose="optional" introduced="^3" class="api">
+ <unit bldFile="mw/srvdiscovery/upnp/upnpstack_plat/upnp_utils_api/group"/>
+ </component>
+ <component name="upnpstack_plat" long-name="UPnP Control Point API" purpose="optional" introduced="^3" class="api">
+ <unit bldFile="mw/srvdiscovery/upnp/upnpstack_plat/upnp_control_point_api/group"/>
+ </component>
+ <component name="upnpstack_plat" long-name="UPnP HTTP Server API" purpose="optional" introduced="^3" class="api">
+ <unit bldFile="mw/srvdiscovery/upnp/upnpstack_plat/upnp_httpserver_api/group"/>
+ </component>
+ <component name="upnpstack_plat" long-name="UPnP HTTP Transfer API" purpose="optional" introduced="^3" class="api">
+ <unit bldFile="mw/srvdiscovery/upnp/upnpstack_plat/upnp_http_transfer_api/group"/>
+ </component>
+ </collection>
<collection name="servicediscoveryandcontrol" long-name="Service Discovery and Control" level="framework">
<component name="servicediscoveryfw" long-name="Service Discovery Framework" introduced="^3" purpose="optional">
<unit bldFile="mw/srvdiscovery/servicediscoveryandcontrol/pnp/group" mrp="mw/srvdiscovery/servicediscoveryandcontrol/pnp/group/servicediscoveryframework.mrp"/>
</component>
</collection>
<collection name="upnp" long-name="UPnP" level="server">
- <component name="upnpstack_plat" long-name="UPnP Stack Platform Interfaces" introduced="^3" purpose="optional" class="api">
- <unit bldFile="mw/srvdiscovery/upnp/upnpstack_plat/group"/>
- </component>
<component name="upnpstack" long-name="UPnP Stack" introduced="^3" purpose="optional">
<unit bldFile="mw/srvdiscovery/upnp/upnpstack/group"/>
</component>
@@ -3496,6 +5067,32 @@
</block>
<block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
<!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
+ <collection name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
+ <component name="upnp_media_server_settings_api" long-name="UPnP Media Server Settings API" filter="s60" class="api">
+ <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
+ </component>
+ <component name="upnp_av_objects_api" long-name="UPnP A/V Objects API" filter="s60" class="api">
+ <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
+ </component>
+ <component name="upnp_media_server_api" long-name="UPnP Media Server API" filter="s60" class="api">
+ <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
+ </component>
+ <component name="upnp_security_plugin_api" long-name="UPnP Security Plugin API" filter="s60" class="api">
+ <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
+ </component>
+ <component name="upnp_avcp_api" long-name="UPnP AVCP API" filter="s60" class="api">
+ <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
+ </component>
+ <component name="upnp_media_server_metadata_api" long-name="UPnP Media Server Metadata API" filter="s60" class="api">
+ <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
+ </component>
+ <component name="upnp_command_api" long-name="UPnP Command API" filter="s60" class="api">
+ <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
+ </component>
+ <component name="upnp_plugin_api" long-name="UPnP Plugin API" filter="s60" class="api">
+ <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
+ </component>
+ </collection>
<collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
<component name="avcontrolframework" filter="s60" long-name="A/V Control Famework" introduced="9.1" deprecated="^3">
<unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
@@ -3654,9 +5251,6 @@
</component>
</collection>
<collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
- <component name="dlnasrv_plat" filter="s60" long-name="DLNA Services Platform Interfaces" class="api">
- <unit bldFile="mw/dlnasrv/dlnasrv_plat/group"/>
- </component>
<component name="dlnasrv_build" filter="s60" long-name="DLNA Services Build">
<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed -->
<unit bldFile="mw/dlnasrv/group"/>
@@ -3664,6 +5258,55 @@
</collection>
</block>
<block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
+ <collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
+ <component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" class="api">
+ <unit bldFile="mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
+ </component>
+ <component name="bluetooth_notifier_api" long-name="Bluetooth Notifier API" filter="s60" class="api">
+ <unit bldFile="mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
+ </component>
+ </collection>
+ <collection name="btservices_plat" long-name="BT Services Platform Interfaces" level="plugin">
+ <component name="bluetooth_dosserver_audio_api" long-name="Bluetooth DOS Server Audio API" filter="s60" class="api">
+ <unit bldFile="mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
+ </component>
+ <component name="bluetooth_dut_mode_api" long-name="Bluetooth DUT Mode API" filter="s60" class="api">
+ <unit bldFile="mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
+ </component>
+ <component name="bluetooth_engine_api" long-name="Bluetooth Engine API" filter="s60" class="api">
+ <unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_api/group"/>
+ </component>
+ <component name="bluetooth_engine_connection_management_api" long-name="Bluetooth Engine Connection Management API" filter="s60" class="api">
+ <unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_connection_management_api/group"/>
+ </component>
+ <component name="bluetooth_engine_device_management_api" long-name="Bluetooth Engine Device Management API" filter="s60" class="api">
+ <unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_device_management_api/group"/>
+ </component>
+ <component name="bluetooth_engine_discovery_api" long-name="Bluetooth Engine Discovery API" filter="s60" class="api">
+ <unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_discovery_api/group"/>
+ </component>
+ <component name="bluetooth_engine_features_api" long-name="Bluetooth Engine Features API" filter="s60" class="api">
+ <unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_features_api/group"/>
+ </component>
+ <component name="bluetooth_engine_settings_api" long-name="Bluetooth Engine Settings API" filter="s60" class="api">
+ <unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_settings_api/group"/>
+ </component>
+ <component name="bluetooth_engine_plugin_api" long-name="Bluetooth Engine Plugin API" filter="s60" class="api">
+ <unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_plugin_api/group"/>
+ </component>
+ <component name="bluetooth_local_variation_api" long-name="Bluetooth Local Variation API" filter="s60" class="api">
+ <unit bldFile="mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
+ </component>
+ <component name="bluetooth_notifier_internal_api" long-name="Bluetooth Notifier internal API" filter="s60" class="api">
+ <unit bldFile="mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
+ </component>
+ <component name="bluetooth_sap_connection_state_api" long-name="Bluetooth SAP Connection State API" filter="s60" class="api">
+ <unit bldFile="mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
+ </component>
+ <component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" class="api">
+ <unit bldFile="mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
+ </component>
+ </collection>
<collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
<component name="bteng" filter="s60" long-name="Bluetooth Engine">
<unit bldFile="mw/btservices/bluetoothengine/bteng/group"/>
@@ -3705,23 +5348,45 @@
</component>
</collection>
<collection name="btservices_info" long-name="BT Services Info" level="plugin">
- <component name="btservices_plat" filter="s60" long-name="BT Services Platform Interfaces" class="api">
- <unit bldFile="mw/btservices/btservices_plat/group"/>
- </component>
- <component name="btservices_pub" filter="s60" long-name="BT Services Public Interfaces" class="api">
- <unit bldFile="mw/btservices/btservices_pub/group"/>
- </component>
<component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
<unit mrp="mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
</component>
</collection>
</block>
<block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
- <collection name="usbservices_info" long-name="USB Services Info" level="plugin">
- <component name="usbservices_plat" filter="s60" long-name="USB Services Platform Interfaces" class="api">
- <unit bldFile="mw/usbservices/usbservices_plat/group"/>
- </component>
- </collection>
+ <collection name="usbservices_plat" long-name="USB Services Platform Interfaces" level="plugin">
+ <component name="pictbridge_api" long-name="PictBridge API" filter="s60" class="api">
+ <unit bldFile="mw/usbservices/usbservices_plat/pictbridge_api/group"/>
+ </component>
+ <component name="ptp_responder_api" long-name="PTP Responder API" filter="s60" class="api">
+ <unit bldFile="mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
+ </component>
+ <component name="ptp_transport_api" long-name="PTP Transport API" filter="s60" class="api">
+ <unit bldFile="mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
+ </component>
+ <component name="usb_device_control_plugin_api" long-name="USB Device Control Plug-in API" filter="s60" class="api">
+ <unit bldFile="mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
+ </component>
+ <component name="usb_notifier_api" long-name="USB Notifier API" filter="s60" class="api">
+ <unit bldFile="mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
+ </component>
+ <component name="usb_personality_api_header" long-name="USB Personality API" filter="s60" class="api">
+ <unit bldFile="mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
+ </component>
+ <component name="usb_personality_plugin_api" long-name="USB Personality Plug-in API" filter="s60" class="api">
+ <unit bldFile="mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
+ </component>
+ <component name="usb_secondary_display_api" long-name="USB Secondary Display API" filter="s60" class="api">
+ <unit bldFile="mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
+ </component>
+ <component name="usb_watcher_api" long-name="USB Watcher API" filter="s60" class="api">
+ <unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
+ </component>
+ <component name="usb_watcher_info_api_header" long-name="USB Watcher Info API" filter="s60" class="api">
+ <unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
+ </component>
+ </collection>
+ <collection name="usbservices_info" long-name="USB Services Info" level="plugin"/>
<collection name="usbengines" long-name="USB Engines" level="generic">
<component name="usbotgwatcher" filter="s60" long-name="USB OTG Watcher">
<unit bldFile="mw/usbservices/usbengines/usbotgwatcher/group"/>
@@ -3779,13 +5444,36 @@
<component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
<unit bldFile="mw/usbservices/usbuis/imageprintui/group"/>
</component>
- <component name="rndisui" filter="s60" long-name="Remote NDIS UI" introduced="^3">
- <unit bldFile="mw/usbservices/usbuis/rndisui/group"/>
- </component>
</collection>
</block>
<block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
+ <collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
+ <component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
+ <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
+ </component>
+ <component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
+ <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
+ </component>
+ <component name="dialup_connection_status_api" long-name="Dial-up Connection Status API" filter="s60" class="api">
+ <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
+ </component>
+ <component name="dun_secondary_display_notification_api" long-name="DUN Secondary Display Notification API" filter="s60" class="api">
+ <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
+ </component>
+ <component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
+ <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
+ </component>
+ <component name="generic_hid_api" long-name="Generic HID API" filter="s60" class="api">
+ <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
+ </component>
+ <component name="locod_bearer_plugin_api" long-name="Locod Bearer Plugin API" filter="s60" class="api">
+ <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
+ </component>
+ <component name="usb_obexservicemanager_client_api" long-name="USB OBEX Service Manager Client API" filter="s60" class="api">
+ <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
+ </component>
+ </collection>
<collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
<component name="locod" long-name="Local Connectivity Daemon">
<unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
@@ -3821,13 +5509,19 @@
<unit bldFile="mw/shortlinkconn/localconnectivityservice/headset/group"/>
</component>
</collection>
- <collection name="shortlinkconn_info" long-name="Shortlink Connectivity Info" level="plugin">
- <component name="shortlinkconn_plat" filter="s60" long-name="Shortlink Connectivity Platform Interfaces" class="api">
- <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/group"/>
- </component>
- </collection>
</block>
<block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
+ <collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
+ <component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
+ <unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
+ </component>
+ <component name="3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
+ <unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
+ </component>
+ <component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
+ <unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
+ </component>
+ </collection>
<collection name="imagehandlinglib" long-name="Image Handling Library" level="lib">
<!-- collection is really a component, need to move down a directory -->
<component name="ihl" filter="s60" long-name="IHL">
@@ -3839,28 +5533,60 @@
<unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
</component>
</collection>
- <collection name="imghandling_info" long-name="Image Handling Info" level="if">
- <component name="imagehandling_plat" filter="s60" long-name="Image Handling Platform Interfaces" class="api">
- <unit bldFile="mw/imghandling/imagehandling_plat/group"/>
- </component>
- </collection>
</block>
<block name="metadatasrv" level="specific" long-name="Legacy Metadata Services" levels="plugin framework server generic specific">
+ <collection name="metadatasrv_pub" long-name="Legacy Metadata Services Public Interfaces" level="specific">
+ <component name="content_listing_framework_api" long-name="Content Listing Framework API" filter="s60" class="api">
+ <unit bldFile="mw/metadatasrv/metadatasrv_pub/content_listing_framework_api/group"/>
+ </component>
+ <component name="media_fetch_api" long-name="Media Fetch API" filter="s60" class="api">
+ <unit bldFile="mw/metadatasrv/metadatasrv_pub/media_fetch_api/group"/>
+ </component>
+ </collection>
+ <collection name="metadatasrv_plat" long-name="Legacy Metadata Services Platform Interfaces" level="specific">
+ <component name="media_fetch_implementation_api" long-name="Media Fetch Implementation API" filter="s60" class="api">
+ <unit bldFile="mw/metadatasrv/metadatasrv_plat/media_fetch_implementation_api/group"/>
+ </component>
+ <component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" filter="s60" class="api">
+ <unit bldFile="mw/metadatasrv/metadatasrv_plat/content_listing_framework_collection_manager_api/group"/>
+ </component>
+ <component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" filter="s60" class="api">
+ <unit bldFile="mw/metadatasrv/metadatasrv_plat/content_listing_framework_extended_api/group"/>
+ </component>
+ </collection>
<collection name="mediamanagementutilities" long-name="Media Management Utilities" level="generic">
<component name="mediafetch" filter="s60" long-name="Media Fetch">
<unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
</component>
</collection>
- <collection name="metadatasrv_info" long-name="Legacy Metadata Services Info" level="specific">
- <component name="metadatasrv_plat" filter="s60" long-name="Legacy Metadata Services Platform Interfaces" class="api">
- <unit bldFile="mw/metadatasrv/metadatasrv_plat/group"/>
- </component>
- <component name="metadatasrv_pub" filter="s60" long-name="Legacy Metadata Services Public Interfaces" class="api">
- <unit bldFile="mw/metadatasrv/metadatasrv_pub/group"/>
- </component>
- </collection>
</block>
<block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
+ <collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
+ <component name="context_engine_plugin_api" long-name="Context Engine Plugin API" introduced="^2" filter="s60" class="api">
+ <unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
+ </component>
+ <component name="harvester_framework_api" long-name="Harvester Framework API" introduced="^2" filter="s60" class="api">
+ <unit bldFile="mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
+ <!-- can only have one unit with the same filter, #include the following from the previous unit -->
+ </component>
+ <component name="location_manager_api" long-name="Location Manager API" introduced="^2" filter="s60" class="api">
+ <unit bldFile="mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
+ </component>
+ <component name="metadata_engine_api" long-name="Metadata Engine API" introduced="^2" filter="s60" class="api">
+ <unit bldFile="mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
+ </component>
+ <component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" introduced="^2" filter="s60" class="api">
+ <unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
+ </component>
+ <component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" introduced="^2" filter="s60" class="api">
+ <unit bldFile="mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
+ </component>
+ </collection>
+ <collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
+ <component name="content_listing_framework_api" long-name="Content Listing Framework API" introduced="^2" filter="s60" class="api">
+ <unit bldFile="mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
+ </component>
+ </collection>
<collection name="metadataengine" long-name="Metadata Engine" level="eng">
<component name="metadataengine_common" filter="s60" long-name="Metadata Engine Common" introduced="^2">
<unit bldFile="mw/mds/metadataengine/common/group"/>
@@ -3944,23 +5670,64 @@
</component>
</collection>
<collection name="mds_info" long-name="Metadata Services Info" level="int">
- <component name="mds_pub" filter="s60" long-name="Metadata Services Public Interfaces" introduced="^2" class="api">
- <unit bldFile="mw/mds/mds_pub/group"/>
- </component>
- <component name="mds_plat" filter="s60" long-name="Metadata Services Platform Interfaces" introduced="^2" class="api">
- <unit bldFile="mw/mds/mds_plat/group"/>
- </component>
<component name="mds_build" filter="s60" long-name="Metadata Services Build" introduced="^2">
<!-- consider distributiing this into the rest of the components in the package -->
<unit bldFile="mw/mds/group"/>
</component>
</collection>
</block>
- <block name="mmuifw" level="specific" long-name="Multimedia UI Framework" levels="mgr mdl util ui">
+ <block name="mmuifw" level="specific" long-name="Multimedia UI Framework" levels="mgr mdl util ui api">
+ <collection name="mmuifw_plat" long-name="Multimedia UI Framework Platform Interfaces" level="api">
+ <component name="alf_widgetfactory_api" long-name="ALF Widget Factory API" filter="s60" class="api">
+ <unit bldFile="mw/mmuifw/mmuifw_plat/alf_widgetfactory_api/group"/>
+ </component>
+ <component name="alf_widgetutils_api" long-name="ALF Widget Utils API" filter="s60" class="api">
+ <unit bldFile="mw/mmuifw/mmuifw_plat/alf_widgetutils_api/group"/>
+ </component>
+ <component name="alf_widgetmodel_api" long-name="ALF Widget Model API" filter="s60" class="api">
+ <unit bldFile="mw/mmuifw/mmuifw_plat/alf_widgetmodel_api/group"/>
+ </component>
+ <component name="osn_container_api" long-name="OSN Container API" filter="s60" class="api">
+ <unit bldFile="mw/mmuifw/mmuifw_plat/osn_container_api/group"/>
+ </component>
+ <component name="osn_global_api" long-name="OSN Global API" filter="s60" class="api">
+ <unit bldFile="mw/mmuifw/mmuifw_plat/osn_global_api/group"/>
+ </component>
+ <component name="osn_string_api" long-name="OSN String API" filter="s60" class="api">
+ <unit bldFile="mw/mmuifw/mmuifw_plat/osn_string_api/group"/>
+ </component>
+ <component name="alf_resourcepool_api" long-name="ALF Resource Pool API" filter="s60" class="api">
+ <unit bldFile="mw/mmuifw/mmuifw_plat/alf_resourcepool_api/group"/>
+ </component>
+ <component name="alf_containerwidget_api" long-name="ALF Container Widget API" filter="s60" class="api">
+ <unit bldFile="mw/mmuifw/mmuifw_plat/alf_containerwidget_api/group"/>
+ </component>
+ <component name="alf_viewwidget_api" long-name="ALF View Widget API" filter="s60" class="api">
+ <unit bldFile="mw/mmuifw/mmuifw_plat/alf_viewwidget_api/group"/>
+ </component>
+ <component name="alf_scrollbarwidget_api" long-name="ALF Scrollbar Widget API" filter="s60" class="api">
+ <unit bldFile="mw/mmuifw/mmuifw_plat/alf_scrollbarwidget_api/group"/>
+ </component>
+ <component name="alf_customlayoutmanagers_api" long-name="ALF Custom Layout Managers API" filter="s60" class="api">
+ <unit bldFile="mw/mmuifw/mmuifw_plat/alf_customlayoutmanagers_api/group"/>
+ </component>
+ <component name="gesturehelper_api" long-name="Gesture Helper API" filter="s60" class="api">
+ <unit bldFile="mw/mmuifw/mmuifw_plat/gesturehelper_api/group"/>
+ </component>
+ <component name="mul_coverflowwidget_api" long-name="MUL Coverflow Widget API" filter="s60" class="api">
+ <unit bldFile="mw/mmuifw/mmuifw_plat/mul_coverflowwidget_api/group"/>
+ </component>
+ <component name="mul_datamodel_api" long-name="MUL Data Model API" filter="s60" class="api">
+ <unit bldFile="mw/mmuifw/mmuifw_plat/mul_datamodel_api/group"/>
+ </component>
+ <component name="mul_sliderwidget_api" long-name="MUL Slider Widget API" filter="s60" class="api">
+ <unit bldFile="mw/mmuifw/mmuifw_plat/mul_sliderwidget_api/group"/>
+ </component>
+ <component name="mul_widget_api" long-name="MUL Widget API" filter="s60" class="api">
+ <unit bldFile="mw/mmuifw/mmuifw_plat/mul_widget_api/group"/>
+ </component>
+ </collection>
<collection name="mmuifw_info" long-name="Multimedia UI Framework Info" level="ui">
- <component name="mmuifw_plat" filter="s60" long-name="Multimedia UI Framework Platform Interfaces" class="api">
- <unit bldFile="mw/mmuifw/mmuifw_plat/group"/>
- </component>
<component name="mmuifw_build" filter="s60" long-name="Multimedia UI Framework Build">
<!-- Move exports into other componetns or remove all #includes and make this a ROM component -->
<unit bldFile="mw/mmuifw/group"/>
@@ -4022,6 +5789,17 @@
</collection>
</block>
<block name="videoutils" level="specific" long-name="Video Utils" levels="eng util if">
+ <collection name="videoutils_plat" long-name="Video Utils Platform Interfaces" level="if">
+ <component name="videoscheduler_api" long-name="Video Scheduler API" filter="s60" class="api">
+ <unit bldFile="mw/videoutils/videoutils_plat/videoscheduler_api/group"/>
+ </component>
+ <component name="videoconnutility_api" long-name="Video Connection Utility API" filter="s60" class="api">
+ <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
+ </component>
+ <component name="videoplayer_constants_api" long-name="Videoplayer Constants API" filter="s60" class="api">
+ <unit bldFile="mw/videoutils/videoutils_plat/videoplayer_constants_api/group"/>
+ </component>
+ </collection>
<collection name="videoscheduler" long-name="Video Scheduler" level="util">
<component name="schedulerclient" filter="s60" long-name="Video Scheduler Client">
<unit bldFile="mw/videoutils/videoscheduler/schedulerclient/group"/>
@@ -4038,13 +5816,83 @@
<unit bldFile="mw/videoutils/videoconnutility/connutility/group"/>
</component>
</collection>
- <collection name="videoutils_info" long-name="Video Utils Info" level="if">
- <component name="videoutils_plat" filter="s60" long-name="Video Utils Platform Interfaces" class="api">
- <unit bldFile="mw/videoutils/videoutils_plat/group"/>
- </component>
- </collection>
+ <collection name="videoutils_info" long-name="Video Utils Info" level="if"/>
</block>
<block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
+ <collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
+ <component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
+ <unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
+ </component>
+ <component name="progressive_download_api" long-name="Progressive Download API" filter="s60" class="api">
+ <unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
+ </component>
+ <component name="equalizer_ui_api" long-name="Equalizer UI API" filter="s60" class="api">
+ <unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
+ </component>
+ <component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
+ <unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
+ </component>
+ <component name="stream_control_custom_command_api" long-name="Stream Control Custom Command API" filter="s60" class="api">
+ <unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
+ </component>
+ <component name="emc_buffer_source_api" long-name="EMC Buffer Source API" filter="s60" class="api">
+ <unit bldFile="mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
+ </component>
+ <component name="emc_file_source_api" long-name="EMC File Source API" filter="s60" class="api">
+ <unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
+ </component>
+ <component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
+ <unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
+ </component>
+ <component name="emc_progressive_download_source_api" long-name="EMC Progressive Download Source API" filter="s60" class="api">
+ <unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
+ </component>
+ <component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
+ <unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
+ </component>
+ <component name="emc_balance_effect_api" long-name="EMC Balance Effect API" filter="s60" class="api">
+ <unit bldFile="mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
+ </component>
+ <component name="emc_descriptor_source_api" long-name="EMC Descriptor Source API" filter="s60" class="api">
+ <unit bldFile="mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
+ </component>
+ <component name="emc_drm_config_intfc_api" long-name="EMC DRM Config Intfc API" filter="s60" class="api">
+ <unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
+ </component>
+ <component name="voip_audio_services_api" long-name="VoIP Audio Services" filter="s60" class="api">
+ <unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
+ </component>
+ <component name="configuration_components_factory_api" long-name="Configuration Components Factory API" filter="s60" class="api">
+ <unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
+ </component>
+ <component name="audio_output_control_utility_api" long-name="Audio Output Control Utility API" filter="s60" class="api">
+ <unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
+ </component>
+ <component name="audio_output_control_utility_proxy_api" long-name="Audio Output Control Utility Proxy API" filter="s60" class="api">
+ <unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
+ </component>
+ <component name="emc_audio_effects_api" long-name="EMC Audio Effects API" filter="s60" class="api">
+ <unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
+ </component>
+ <component name="call_audio_control_api" long-name="Call AudioControl API" filter="s60" class="api">
+ <unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
+ </component>
+ <component name="radio_utilities_api" long-name="Radio Utilities API" filter="s60" class="api">
+ <unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
+ </component>
+ <component name="radio_preset_utilities_api" long-name="Radio Preset Utilities API" filter="s60" class="api">
+ <unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
+ </component>
+ <component name="radio_monitor_api" long-name="Radio Monitor API" filter="s60" class="api">
+ <unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
+ </component>
+ <component name="thumbnail_engine_api" long-name="Thumbnail Engine API" filter="s60" class="api">
+ <unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
+ </component>
+ <component name="telephony_multimedia_service_api" long-name="Telephony Multimedia Service API" filter="s60" class="api">
+ <unit bldFile="mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
+ </component>
+ </collection>
<collection name="mmfenh" long-name="MMF Enhancements" level="generic">
<component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
<unit bldFile="mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
@@ -4099,9 +5947,6 @@
</component>
</collection>
<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
- <component name="mmmw_plat" filter="s60" long-name="Multimedia Middleware Platform Interfaces" class="api">
- <unit bldFile="mw/mmmw/mmmw_plat/group"/>
- </component>
<component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
<unit mrp="mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
</component>
@@ -4116,6 +5961,32 @@
</collection>
</block>
<block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
+ <collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
+ <component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
+ <unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
+ </component>
+ <component name="cae_extentension_api" long-name="CAE Extension API" filter="s60" class="api">
+ <unit bldFile="mw/camerasrv/camerasrv_plat/cae_extentension_api/group"/>
+ </component>
+ <component name="camera_application_engine_api" long-name="Camera Application Engine API" filter="s60" class="api">
+ <unit bldFile="mw/camerasrv/camerasrv_plat/camera_application_engine_api/group" filter="!test"/>
+ </component>
+ <component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
+ <unit bldFile="mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
+ </component>
+ <component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" class="api">
+ <unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
+ </component>
+ <component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
+ <unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
+ </component>
+ <component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
+ <unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
+ </component>
+ <component name="asynchronous_file_saving_queue_api" long-name="Asynchronous File Saving Queue API" filter="s60" class="api">
+ <unit bldFile="mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/group" filter="!test"/>
+ </component>
+ </collection>
<collection name="camappengine" long-name="Camera App Engine" level="fw">
<!-- is this collection really a component? If so, move down a directory -->
<component name="stillconverter" filter="s60" long-name="Still Image Converter" class="placeholder">
@@ -4145,9 +6016,6 @@
</component>
</collection>
<collection name="camerasrv_info" long-name="Camera Services Info" level="api">
- <component name="camerasrv_plat" filter="s60" long-name="Camera Services Platform Interfaces" class="api">
- <unit bldFile="mw/camerasrv/camerasrv_plat/group"/>
- </component>
<component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
<!-- should split into individual bld.infs -->
<unit bldFile="mw/camerasrv/group"/>
@@ -4155,6 +6023,74 @@
</collection>
</block>
<block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
+ <collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
+ <component name="inc" long-name="Inc" introduced="^1" filter="s60" class="api">
+ <unit bldFile="mw/mmappfw/mmappfw_plat/inc/mmappfwbldvariant.hrh"/>
+ </component>
+ <component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
+ <unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
+ </component>
+ <component name="harvester_collection_mediator_api" long-name="Harvester Collection Mediator API" introduced="^1" filter="s60" class="api">
+ <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
+ </component>
+ <component name="harvester_metadata_extractor_api" long-name="Harvester Metadata Extractor API" introduced="^1" filter="s60" class="api">
+ <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
+ </component>
+ <component name="harvester_server_api" long-name="Harvester Server API" introduced="^1" filter="s60" class="api">
+ <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
+ </component>
+ <component name="harvester_utility_api" long-name="Harvester Utility API" introduced="^1" filter="s60" class="api">
+ <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
+ </component>
+ <component name="playlist_engine_api" long-name="Playlist Engine API" introduced="^1" filter="s60" class="api">
+ <unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
+ </component>
+ <component name="mtp_keys_api" long-name="MTP Keys API" introduced="^1" filter="s60" class="api">
+ <unit bldFile="mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
+ </component>
+ <component name="mpx_collection_common_definition_api" long-name="MPX Collection Common Definition API" introduced="^1" filter="s60" class="api">
+ <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
+ </component>
+ <component name="mpx_collection_utility_api" long-name="MPX Collection Utility API" introduced="^1" filter="s60" class="api">
+ <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
+ </component>
+ <component name="mpx_common_api" long-name="MPX Common API" introduced="^1" filter="s60" class="api">
+ <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
+ </component>
+ <component name="mpx_common_definition_api" long-name="MPX Common Definition API" introduced="^1" filter="s60" class="api">
+ <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
+ </component>
+ <component name="mpx_playback_common_definition_api" long-name="MPX Playback Common Definition API" introduced="^1" filter="s60" class="api">
+ <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
+ </component>
+ <component name="mpx_playback_utility_api" long-name="MPX Playback Utility API" introduced="^1" filter="s60" class="api">
+ <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
+ </component>
+ <component name="mpx_base_view_plugins_api" long-name="MPX Base View Plugins API" introduced="^1" filter="s60" class="api">
+ <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
+ </component>
+ <component name="mpx_view_utility_api" long-name="MPX View Utility API" introduced="^1" filter="s60" class="api">
+ <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
+ </component>
+ <component name="mpx_albumart_utility_api" long-name="MPX Album Art Utility API" introduced="^1" filter="s60" class="api">
+ <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
+ </component>
+ <component name="media_player_settings_engine_api" long-name="Media Player Settings Engine API" introduced="^1" filter="s60" class="api">
+ <unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
+ </component>
+ <component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
+ <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_backstepping_utility_api/group"/>
+ </component>
+ <component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
+ <unit bldFile="mw/mmappfw/mmappfw_plat/asx_parser_api/group"/>
+ </component>
+ <component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
+ <unit bldFile="mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
+ </component>
+ <component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
+ <unit bldFile="mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
+ </component>
+ </collection>
<collection name="mpx" long-name="Multimedia Player" level="fw">
<component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
<unit bldFile="mw/mmappfw/mpx/commonframework/group"/>
@@ -4218,12 +6154,49 @@
<unit bldFile="mw/mmappfw/group"/>
</component>
<component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1"/>
- <component name="mmappfw_plat" filter="s60" long-name="Multimedia App Framework Platform Interfaces" introduced="^1" class="api">
- <unit bldFile="mw/mmappfw/mmappfw_plat/group"/>
- </component>
- </collection>
- </block>
- <block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework">
+ </collection>
+ </block>
+ <block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
+ <collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
+ <component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
+ <unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
+ </component>
+ <component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
+ <unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
+ </component>
+ <component name="input_language_info_api" long-name="Input Language Info API" filter="s60" class="api">
+ <unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
+ </component>
+ </collection>
+ <collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
+ <component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
+ <unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
+ </component>
+ <component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
+ <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
+ </component>
+ <component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
+ <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
+ </component>
+ <component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
+ <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
+ </component>
+ <component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" class="api">
+ <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
+ </component>
+ <component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
+ <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
+ </component>
+ <component name="aknfep_pen_support_api" long-name="Avkon FEP Pen Support API" filter="s60" class="api">
+ <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
+ </component>
+ <component name="ptiengine_indic_definitions_api" long-name="PTI Engine Indic Definitions API" filter="s60" class="api">
+ <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
+ </component>
+ <component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
+ <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
+ </component>
+ </collection>
<collection name="textinput" long-name="Text Input" level="framework">
<component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
<!--uncomment when configuration is turned on and textinput_build is removed-->
@@ -4305,13 +6278,7 @@
<unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
</component>
</collection>
- <collection name="inputmethods_info" long-name="Input Methods Info" level="framework">
- <component name="inputmethods_plat" filter="s60" long-name="Input Methods Platform Interfaces" class="api">
- <unit bldFile="mw/inputmethods/inputmethods_plat/group"/>
- </component>
- <component name="inputmethods_pub" filter="s60" long-name="Input Methods Public Interfaces" class="api">
- <unit bldFile="mw/inputmethods/inputmethods_pub/group"/>
- </component>
+ <collection name="inputmethods_info" long-name="Input Methods Info" level="api">
<component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="^2" purpose="development" class="config PC">
<unit mrp="mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
</component>
@@ -4319,6 +6286,468 @@
</block>
<block name="qt" level="generic" long-name="Qt"/>
<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
+ <collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
+ <component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group" filter="!test"/>
+ </component>
+ <component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
+ </component>
+ <component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
+ </component>
+ <component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
+ </component>
+ <component name="item_finder_api" long-name="Item Finder API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
+ </component>
+ <component name="avkon_fonts_api" long-name="Avkon Fonts API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
+ </component>
+ <component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
+ </component>
+ <component name="personalisation_plugin_api" long-name="Personalisation Plugin API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
+ </component>
+ <component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
+ </component>
+ <component name="personalisation_application_api" long-name="Personalisation Application API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
+ </component>
+ <component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
+ </component>
+ <component name="avkon_secondary_display_support_api" long-name="AVKON Secondary Display Support API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
+ </component>
+ <component name="extended_setting_pages_api" long-name="Extended Setting Pages API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
+ </component>
+ <component name="extended_lists_api" long-name="Extended Lists API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
+ </component>
+ <component name="input_block_api" long-name="Input Block API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
+ </component>
+ <component name="avkon_ui_server_api" long-name="AVKON UI Server API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
+ </component>
+ <component name="number_grouping_api" long-name="Number Grouping API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
+ </component>
+ <component name="extended_status_pane_api" long-name="Extended Status Pane API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
+ </component>
+ <component name="extended_notifiers_api" long-name="Extended Notifiers API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
+ </component>
+ <component name="task_list_api" long-name="Task List API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
+ </component>
+ <component name="personalisation_slide_show_dialog_api" long-name="Personalisation Slide Show Dialog API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
+ </component>
+ <component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
+ </component>
+ <component name="emergency_call_support_api" long-name="Emergency Call Support API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
+ </component>
+ <component name="extended_dialogs_api" long-name="Extended Dialogs API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/extended_dialogs_api/group"/>
+ </component>
+ <component name="legacy_ui_framework_headers_api" long-name="Legacy UI Framework Headers API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
+ </component>
+ <component name="extended_editors_api" long-name="Extended Editors API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
+ </component>
+ <component name="alarm_api" long-name="Alarm API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
+ </component>
+ <component name="aiw_service_interface_base_api" long-name="AIW Service Interface Base API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
+ </component>
+ <component name="list_effects_api" long-name="List Effects API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
+ </component>
+ <component name="find_item_ui_api" long-name="Find Item UI API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
+ </component>
+ <component name="server_application_services_api" long-name="Server Application Services API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
+ </component>
+ <component name="common_ui_settings_api" long-name="Common UI Settings API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/common_ui_settings_api/group"/>
+ </component>
+ <component name="aiw_service_interface_menu_api" long-name="AIW Service Interface Menu API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
+ </component>
+ <component name="eikon_server_extension_client_api" long-name="EIKON Server Extension Client API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
+ </component>
+ <component name="skinnable_clock_api" long-name="Skinnable Clock API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
+ </component>
+ <component name="battery_pane_api" long-name="Battery Pane API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
+ </component>
+ <component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
+ </component>
+ <component name="personalisation_localised_texts_api" long-name="Personalisation Localised Texts API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
+ </component>
+ <component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
+ </component>
+ <component name="avkon_status_api" long-name="AVKON Status API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/avkon_status_api/group"/>
+ </component>
+ <component name="application_switching_api" long-name="Application Switching API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
+ </component>
+ <component name="avkon_localised_texts_api" long-name="AVKON Localised Texts API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
+ </component>
+ <component name="avkon_secondary_display_api" long-name="AVKON Secondary Display API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
+ </component>
+ <component name="extended_animation_api" long-name="Extended Animation API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
+ </component>
+ <component name="extended_notes_api" long-name="Extended Notes API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
+ </component>
+ <component name="screensaver_animation_plugin_definitions_api" long-name="Screensaver Animation Plugin Definitions API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/screensaver_animation_plugin_definitions_api/group"/>
+ </component>
+ <component name="text_scroller_api" long-name="Text Scroller API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
+ </component>
+ <component name="custom_cursors_api" long-name="Custom Cursors API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
+ </component>
+ <component name="screensaver_settings_api" long-name="Screensaver Settings API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/screensaver_settings_api/group"/>
+ </component>
+ <component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/global_window_priorities_api/group"/>
+ </component>
+ <component name="extended_indicators_api" long-name="Extended Indicators API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
+ </component>
+ <component name="special_character_table_api" long-name="Special Character Table API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
+ </component>
+ <component name="avkon_settings_api" long-name="AVKON Settings API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/avkon_settings_api/group"/>
+ </component>
+ <component name="extended_sounds_api" long-name="Extended Sounds API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/group"/>
+ </component>
+ <component name="themes_settings_api" long-name="Themes Settings API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/themes_settings_api/group"/>
+ </component>
+ <component name="media_shared_document_api" long-name="Media Shared Document API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
+ </component>
+ <component name="extended_queries_api" long-name="Extended Queries API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/extended_queries_api/group"/>
+ </component>
+ <component name="phone_number_text_utilities_api" long-name="Phone Number Text Utilities API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
+ </component>
+ <component name="screensaver_runtime_api" long-name="Screensaver Runtime API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/screensaver_runtime_api/group"/>
+ </component>
+ <component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/extended_scroller_api/group"/>
+ </component>
+ <component name="key_rotator_api" long-name="Key Rotator API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
+ </component>
+ <component name="extended_grids_api" long-name="Extended Grids API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
+ </component>
+ <component name="generic_parameter_api" long-name="Generic Parameter API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
+ </component>
+ <component name="indicator_touch_observer_api" long-name="Indicator Touch Observer API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
+ </component>
+ <component name="popup_form_api" long-name="Popup Form API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
+ </component>
+ <component name="stylus_activated_popup_api" long-name="Stylus Activated Pop-up API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
+ </component>
+ <component name="indicator_plugin_api" long-name="Indicator Plugin API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
+ </component>
+ <component name="layout_configuration_api" long-name="Layout Configuration API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
+ </component>
+ <component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
+ </component>
+ <component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
+ </component>
+ <component name="extended_initialization_api" long-name="Extended Initialization API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
+ </component>
+ <component name="long_tap_animation_api" long-name="Long Tap Animation API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
+ </component>
+ <component name="extended_ui_framework_definitions_api" long-name="Extended UI Framework Definitions API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
+ </component>
+ <component name="extended_buttons_api" long-name="Extended Buttons API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
+ </component>
+ <component name="aiw_provider_utility_api" long-name="AIW Provider Utility API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
+ </component>
+ <component name="transition_effect_parameters_api" long-name="Transition Effect Parameters API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
+ </component>
+ <component name="extended_input_capabilities_api" long-name="Extended Input Capabilities API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
+ </component>
+ <component name="uikon_status_api" long-name="UIKON Status API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/uikon_status_api/group"/>
+ </component>
+ <component name="transition_effect_utilities_api" long-name="Transition Effect Utilities API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
+ </component>
+ <component name="pointer_event_modifier_api" long-name="Pointer Event Modifier API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
+ </component>
+ <component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
+ </component>
+ <component name="ganes_api" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
+ </component>
+ <component name="ode_api" long-name="Ode API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/ode_api/group"/>
+ </component>
+ <component name="physics_api" long-name="Physics API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/physics_api/group"/>
+ </component>
+ <component name="touch_pane_api" long-name="Touch Pane API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
+ </component>
+ <component name="touch_pane_observer_api" long-name="Touch Pane Observer API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
+ </component>
+ <component name="alternate_fs_api" long-name="Alternate FS API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/alternate_fs_api/group"/>
+ </component>
+ <component name="discreet_popup_api" long-name="Discreet Popup API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/discreet_popup_api/group"/>
+ </component>
+ <component name="touch_gesture_framework_api" long-name="Touch Gesture Framework API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
+ <!-- should this be commented out? -->
+ <!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
+ </component>
+ <component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
+ </component>
+ </collection>
+ <collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
+ <component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
+ </component>
+ <component name="window_server_event_observer_api" long-name="Window Server Event Observer API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
+ </component>
+ <component name="application_framework_api" long-name="Application Framework API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
+ </component>
+ <component name="scroller_api" long-name="Scroller API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
+ </component>
+ <component name="ui_framework_utilities_api" long-name="UI Framework Utilities API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
+ </component>
+ <component name="ui_framework_definitions_api" long-name="UI Framework Definitions API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
+ </component>
+ <component name="buttons_api" long-name="Buttons API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
+ </component>
+ <component name="queries_api" long-name="Queries API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
+ </component>
+ <component name="aiw_generic_parameter_api" long-name="AIW Generic Parameter API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
+ </component>
+ <component name="editors_api" long-name="Editors API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
+ </component>
+ <component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
+ </component>
+ <component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
+ </component>
+ <component name="fonts_api" long-name="Fonts API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
+ </component>
+ <component name="screen_clearer_api" long-name="Screen Clearer API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
+ </component>
+ <component name="notifiers_api" long-name="Notifiers API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
+ </component>
+ <component name="notes_api" long-name="Notes API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
+ </component>
+ <component name="screen_saver_api" long-name="Screen Saver API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/screen_saver_api/group" filter="!test"/>
+ </component>
+ <component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
+ </component>
+ <component name="base_controls_api" long-name="Base Controls API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
+ </component>
+ <component name="grids_api" long-name="Grids API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
+ </component>
+ <component name="context_pane_api" long-name="Context Pane API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
+ </component>
+ <component name="lists_api" long-name="Lists API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
+ </component>
+ <component name="popups_api" long-name="Popups API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
+ </component>
+ <component name="misc_controls_api" long-name="Misc Controls API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
+ </component>
+ <component name="keylock_api" long-name="Keylock API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
+ </component>
+ <component name="options_menu_api" long-name="Options Menu API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
+ </component>
+ <component name="hierarchical_lists_api" long-name="Hierarchical Lists API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
+ </component>
+ <component name="navigation_pane_api" long-name="Navigation Pane API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
+ </component>
+ <component name="tabs_api" long-name="Tabs API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
+ </component>
+ <component name="title_pane_touch_observer_api" long-name="Title Pane Touch Observer API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
+ </component>
+ <component name="choice_list_api" long-name="Choice List API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
+ </component>
+ <component name="info_popup_note_api" long-name="Info Popup Note API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
+ </component>
+ <component name="setting_pages_api" long-name="Setting Pages API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
+ </component>
+ <component name="screen_mode_api" long-name="Screen Mode API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
+ </component>
+ <component name="indicators_api" long-name="Indicators API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
+ </component>
+ <component name="error_ui_api" long-name="Error UI API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
+ </component>
+ <component name="animation_api" long-name="Animation API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
+ </component>
+ <component name="searchfield_api" long-name="Searchfield API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
+ </component>
+ <component name="labels_api" long-name="Labels API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
+ </component>
+ <component name="hotkeys_api" long-name="Hotkeys API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
+ </component>
+ <component name="initialization_api" long-name="Initialization API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
+ </component>
+ <component name="volume_control_api" long-name="Volume Control API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
+ </component>
+ <component name="title_pane_api" long-name="Title Pane API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
+ </component>
+ <component name="sounds_api" long-name="Sounds API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
+ </component>
+ <component name="aiw_service_handler_api" long-name="AIW Service Handler API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
+ </component>
+ <component name="aiw_criteria_api" long-name="AIW Criteria API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
+ </component>
+ <component name="touch_ui_utilities_api" long-name="Touch UI Utilities API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
+ </component>
+ <component name="generic_button_api" long-name="Generic Button API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
+ </component>
+ <component name="form_api" long-name="Form API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/form_api/group" filter="!test"/>
+ </component>
+ <component name="uikon_core_controls" long-name="Uikon Core Controls" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
+ </component>
+ <component name="calendar_api" long-name="Calendar API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
+ </component>
+ <component name="toolbar_api" long-name="Toolbar API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
+ </component>
+ <component name="server_application_api" long-name="Server Application API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
+ </component>
+ <component name="slider_api" long-name="Slider API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
+ </component>
+ <component name="private_ui_framework_api" long-name="Private UI Framework API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
+ </component>
+ <component name="dialogs_api" long-name="Dialogs API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
+ </component>
+ <component name="document_handler_api" long-name="Document handler API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/document_handler_api/group"/>
+ </component>
+ <component name="images_api" long-name="Images API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/images_api/group" filter="!test"/>
+ </component>
+ <component name="stylus_popup_menu_api" long-name="Stylus Pop-up Menu API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
+ </component>
+ <component name="information_preview_popup_api" long-name="Information Preview Popup API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
+ </component>
+ <component name="intermediate_state_api" long-name="Intermediate State API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
+ </component>
+ <component name="help_launcher_api" long-name="Help Launcher API" filter="s60" class="api">
+ <unit bldFile="mw/classicui/classicui_pub/help_launcher_api/group"/>
+ </component>
+ </collection>
<collection name="ode" long-name="Open Dynamics Engine" level="support">
<!-- the collection is really a component. Move down a directory.-->
<component name="ode_build" filter="s60" long-name="ODE">
@@ -4431,12 +6860,6 @@
</component>
</collection>
<collection name="classicui_info" long-name="Classic UI Info" level="specific">
- <component name="classicui_pub" filter="s60" long-name="Classic UI Public Interfaces" class="api">
- <unit bldFile="mw/classicui/classicui_pub/group"/>
- </component>
- <component name="classicui_plat" filter="s60" long-name="Classic UI Platform Interfaces" class="api">
- <unit bldFile="mw/classicui/classicui_plat/group"/>
- </component>
<!-- the multiple units in the API test components need to be resolved -->
<component name="classicui_metadata" long-name="Classic UI Metadata" introduced="^2" purpose="development" class="config PC">
<unit mrp="mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
@@ -4444,9 +6867,12 @@
</collection>
</block>
<block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
- <collection name="svgt_info" long-name="SVG Tiny Info" level="ui">
- <component name="svgt_plat" filter="s60" long-name="SVG Tiny Platform Interfaces" introduced="9.2" class="api">
- <unit bldFile="mw/svgt/svgt_plat/group"/>
+ <collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
+ <component name="svgt_api" long-name="SVGT API" introduced="9.2" filter="s60" class="api">
+ <unit bldFile="mw/svgt/svgt_plat/svgt_api/group"/>
+ </component>
+ <component name="nvg_api" long-name="NVG API" introduced="9.2" filter="s60" class="api">
+ <unit bldFile="mw/svgt/svgt_plat/nvg_api/group"/>
</component>
</collection>
<collection name="svgtopt" long-name="SVG-T Engine" level="util">
@@ -4460,9 +6886,24 @@
</collection>
</block>
<block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
- <collection name="uiaccelerator_info" long-name="UI Accelerator Info" level="if">
- <component name="uiaccelerator_plat" filter="s60" long-name="UI Accelerator Platform Interfaces" class="api">
- <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/group"/>
+ <collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="if">
+ <component name="alf_core_toolkit_api" long-name="ALF Core Toolkit API" filter="s60" class="api">
+ <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
+ </component>
+ <component name="alf_visual_api" long-name="ALF Visual API" filter="s60" class="api">
+ <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
+ </component>
+ <component name="alf_extended_visual_api" long-name="ALF Extended Visual API" filter="s60" class="api">
+ <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
+ </component>
+ <component name="alf_extension_api" long-name="ALF Extension API" filter="s60" class="api">
+ <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
+ </component>
+ <component name="alf_tracing_api" long-name="ALF Tracing API" filter="s60" class="api">
+ <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
+ </component>
+ <component name="alf_client_server_api" long-name="ALF Client Server API" filter="s60" class="api">
+ <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
</component>
</collection>
<collection name="uiacceltk" long-name="UI Accelerator Toolkit" level="framework">
@@ -4476,21 +6917,79 @@
</collection>
</block>
<block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
+ <!-- are the custom filters below needed? -->
+ <collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
+ <component name="pictograph_api" long-name="Pictograph API" filter="s60" class="api">
+ <unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
+ </component>
+ <component name="skins_api" long-name="Skins API" filter="s60" class="api">
+ <unit bldFile="mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
+ </component>
+ <component name="font_definition_api" long-name="Font Definition API" filter="s60" class="api">
+ <unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
+ </component>
+ <component name="graphics_api" long-name="Graphics API" filter="s60" class="api">
+ <unit bldFile="mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
+ </component>
+ <component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" class="api">
+ <unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
+ </component>
+ <component name="layout_id_definitions_api" long-name="Layout ID Definitions API" filter="s60" class="api">
+ <unit bldFile="mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
+ </component>
+ </collection>
+ <collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
+ <component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
+ <unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
+ </component>
+ <component name="layout_data_api" long-name="Layout Data API" filter="s60" class="api">
+ <unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
+ </component>
+ <component name="cdl_api" long-name="CDL API" filter="s60" class="api">
+ <unit bldFile="mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
+ </component>
+ <component name="extended_skins_api" long-name="Extended Skins API" filter="s60" class="api">
+ <unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
+ </component>
+ <component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" class="api">
+ <unit bldFile="mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
+ </component>
+ <component name="extended_fonts_api" long-name="Extended Fonts API" filter="s60" class="api">
+ <unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
+ </component>
+ <component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" class="api">
+ <unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
+ </component>
+ <component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" class="api">
+ <unit bldFile="mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
+ </component>
+ <component name="personalisation_and_skins_settings_api" long-name="Personalisation and Skins Settings API" filter="s60" class="api">
+ <unit bldFile="mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
+ </component>
+ <component name="tfx_effect_setup_plugin_api" long-name="TFX Effect Setup Plug-in API" filter="s60" class="api">
+ <unit bldFile="mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
+ </component>
+ <component name="mifconv_definitions_api" long-name="Mifconv Definitions API" filter="s60" class="api">
+ <unit bldFile="mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
+ </component>
+ <component name="wallpaper_configuration_api" long-name="Wallpaper Configuration API" filter="s60" class="api">
+ <unit bldFile="mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
+ </component>
+ <component name="language_code_definitions_api" long-name="Language Code Definitions API" filter="s60" class="api">
+ <unit bldFile="mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
+ </component>
+ <component name="skins_image_attributes_api" long-name="Skins Image Attributes API" filter="s60" class="api">
+ <unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
+ </component>
+ <component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" class="api">
+ <unit bldFile="mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
+ </component>
+ <component name="tfx_server_plugin_ids_api" long-name="TFX Server Plug-in IDs API" filter="s60" class="api">
+ <unit bldFile="mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
+ </component>
+ </collection>
<collection name="uiresources_info" long-name="UI Resources Info" level="data">
- <component name="uiresources_plat" filter="s60" long-name="UI Resources Platform Interfaces" class="api">
- <unit bldFile="mw/uiresources/uiresources_plat/group"/>
- </component>
- <component name="uiresources_pub" filter="s60" long-name="UI Resources Public Interfaces" class="api">
- <unit bldFile="mw/uiresources/uiresources_pub/group"/>
- </component>
<component name="uiresources_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development"/>
- <!-- are these custom filters needed? -->
- <component name="uiresources_test_pat" filter="s60,test,api_test" long-name="UI Resources Platform API Tests" purpose="development" class="placeholder">
- <!-- can only have one unit. Need to #include from a common one -->
- </component>
- <component name="uiresources_test_pat" filter="s60,test,api_test" long-name="UI Resources Public API Tests" purpose="development" class="placeholder">
- <!-- can only have one unit. Need to #include from a common one -->
- </component>
</collection>
<collection name="uigraphics" long-name="UI Graphics" level="generic">
<component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">
@@ -4563,6 +7062,22 @@
</collection>
</block>
<block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
+ <collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
+ <component name="tacticon_api" long-name="Tacticon API" introduced="^1" filter="s60" class="api">
+ <unit bldFile="mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
+ </component>
+ <component name="tactile_feedback_core_api" long-name="Tactile Feedback Core API" introduced="^1" filter="s60" class="api">
+ <unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
+ </component>
+ <component name="tactile_feedback_server_api" long-name="Tactile Feedback Server API" introduced="^1" filter="s60" class="api">
+ <unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
+ </component>
+ </collection>
+ <collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
+ <component name="tactile_feedback_client_api" long-name="Tactile Feedback Client API" introduced="^1" filter="s60" class="api">
+ <unit bldFile="mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
+ </component>
+ </collection>
<collection name="tacticonserver" long-name="Tacticon Server" level="server">
<!-- collection is really a component. Move down a directory -->
<component name="tacticonserver_build" filter="s60" long-name="Tacticon Server Build" introduced="^3">
@@ -4591,16 +7106,45 @@
<unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
</component>
</collection>
- <collection name="hapticsservices_info" long-name="Haptics Services Info" level="api">
- <component name="hapticsservices_pub" filter="s60" long-name="Haptics Services Public Interfaces" introduced="^1" class="api">
- <unit bldFile="mw/hapticsservices/hapticsservices_pub/group"/>
- </component>
- <component name="hapticsservices_plat" filter="s60" long-name="Haptics Services Platform Interfaces" introduced="^1" class="api">
- <unit bldFile="mw/hapticsservices/hapticsservices_plat/group"/>
- </component>
- </collection>
</block>
<block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
+ <collection name="gsprofilesrv_pub" long-name="GS and Profiles Services Public Interfaces" level="specific">
+ <component name="profiles_engine_active_profile_settings_api" long-name="Profiles Engine Active Profile Settings API" filter="s60" class="api">
+ <unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
+ </component>
+ <component name="profiles_engine_wrapper_api" long-name="Profiles Engine Wrapper API" filter="s60" class="api">
+ <unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
+ </component>
+ </collection>
+ <collection name="gsprofilesrv_plat" long-name="GS and Profiles Services Platform Interfaces" level="specific">
+ <component name="profiles_engine_api" long-name="Profiles Engine API" filter="s60" class="api">
+ <unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
+ </component>
+ <component name="profiles_mediafilelist_api" long-name="Media File List API" filter="s60" class="api">
+ <unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_mediafilelist_api/group"/>
+ </component>
+ <component name="filelist_api" long-name="File List API" filter="s60" class="api">
+ <unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/filelist_api/group"/>
+ </component>
+ <component name="settings_backgroundimage_api" long-name="Settings Background Image API" filter="s60" class="api">
+ <unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
+ </component>
+ <component name="settings_framework_api" long-name="Settings Framework API" filter="s60" class="api">
+ <unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
+ </component>
+ <component name="settings_launch_api" long-name="Settings Launch API" filter="s60" class="api">
+ <unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
+ </component>
+ <component name="settings_listbox_api" long-name="Settings List Box API" filter="s60" class="api">
+ <unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
+ </component>
+ <component name="settings_plugin_api" long-name="Settings Plugin API" filter="s60" class="api">
+ <unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
+ </component>
+ <component name="settings_uis_cenrep_collection_api" long-name="Settings UIs CenRep Collection API" filter="s60" class="api">
+ <unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
+ </component>
+ </collection>
<collection name="gssettingsuis" long-name="General Settings UIs" level="framework">
<component name="gs" filter="s60" long-name="General Settings" introduced="9.2">
<unit bldFile="mw/gsprofilesrv/gssettingsuis/gs/group"/>
@@ -4620,16 +7164,76 @@
<unit bldFile="mw/gsprofilesrv/profilesservices/ringingtone3dplugin/group"/>
</component>
</collection>
- <collection name="gsprofilesrv_info" long-name="GS and Profiles Services Info" level="specific">
- <component name="gsprofilesrv_plat" filter="s60" long-name="GS and Profiles Services Platform Interfaces" class="api">
- <unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/group"/>
- </component>
- <component name="gsprofilesrv_pub" filter="s60" long-name="GS and Profiles Services Public Interfaces" class="api">
- <unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/group"/>
- </component>
- </collection>
</block>
<block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
+ <collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
+ <component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
+ <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_content_model_api/group"/>
+ </component>
+ <component name="ai_utilities_api" long-name="AI Utilities API" filter="s60" class="api">
+ <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_utilities_api/group" filter="!test"/>
+ </component>
+ <component name="ai_plugin_management_api" long-name="AI Plug-in Management API" filter="s60" class="api">
+ <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_management_api/group"/>
+ </component>
+ <component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
+ <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_information_api/group"/>
+ </component>
+ <component name="ai_variation_api" long-name="AI Variation API" filter="s60" class="api">
+ <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_variation_api/group"/>
+ </component>
+ <component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api">
+ <unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
+ </component>
+ <component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api">
+ <unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
+ </component>
+ <component name="menu_model_api" long-name="Menu Model API" filter="s60" class="api">
+ <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_model_api/group"/>
+ </component>
+ <component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api">
+ <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
+ </component>
+ <component name="external_home_screen_api" long-name="External Home Screen API" filter="s60" class="api">
+ <unit bldFile="mw/homescreensrv/homescreensrv_plat/external_home_screen_api/group"/>
+ </component>
+ <component name="menu_content_service_api" long-name="Menu Content Service API" filter="s60" class="api">
+ <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_content_service_api/group" filter="!test"/>
+ </component>
+ <component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api">
+ <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
+ </component>
+ <component name="sapi_backstepping" long-name="SAPI Backstepping" filter="s60" class="api">
+ <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_backstepping/group"/>
+ </component>
+ <component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api">
+ <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
+ </component>
+ <component name="sapi_homescreenplugin" long-name="SAPI Homescreen Plugin" filter="s60" class="api">
+ <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/group" filter="!test"/>
+ </component>
+ <component name="sapi_menucontent" long-name="SAPI Menu Content" filter="s60" class="api">
+ <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_menucontent/group"/>
+ </component>
+ <component name="xcfw_api" long-name="XCFW API" filter="s60" class="api">
+ <unit bldFile="mw/homescreensrv/homescreensrv_plat/xcfw_api/group"/>
+ </component>
+ <component name="idlefw_api" long-name="Idle Framework API" filter="s60" class="api">
+ <unit bldFile="mw/homescreensrv/homescreensrv_plat/idlefw_api/group"/>
+ </component>
+ <component name="hs_widget_publisher_api" long-name="Home Screen Publishing API" filter="s60" class="api">
+ <unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/group"/>
+ </component>
+ <component name="context_utility_api" long-name="UI Context Utility API" filter="s60" class="api">
+ <unit bldFile="mw/homescreensrv/homescreensrv_plat/context_utility_api/group"/>
+ </component>
+ <component name="hs_settings_api" long-name="HS Settings API" filter="s60" class="api">
+ <unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_settings_api/group"/>
+ </component>
+ <component name="hs_content_control_api" long-name="HS Content Control API" filter="s60" class="api">
+ <unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_content_control_api/group"/>
+ </component>
+ </collection>
<collection name="xcfw" long-name="XML Content Framework" level="framework">
<!-- collection is really a component, needs to be moved down a directory -->
<component name="xcfw_build" filter="s60" long-name="XML Content Framework Build">
@@ -4699,6 +7303,7 @@
</collection>
<collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
<component name="contentpublishingdebug" filter="s60" long-name="Content Publishing Debug">
+ <!-- need to move this component outside of contentpublishingutils and into separate component directory -->
<!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
</component>
<component name="contentpublishingutils" filter="s60" long-name="Content Publishing Utils">
@@ -4744,13 +7349,42 @@
<unit bldFile="mw/homescreensrv/contentcontrolsrv/group"/>
</component>
</collection>
- <collection name="homescreensrv_info" long-name="Home Screen Services Info" level="specific">
- <component name="homescreensrv_plat" filter="s60" long-name="Home Screen Services Platform Interfaces" class="api">
- <unit bldFile="mw/homescreensrv/homescreensrv_plat/group"/>
- </component>
- </collection>
</block>
<block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
+ <collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
+ <component name="iaupdate_api" long-name="IA Update API" filter="s60" class="api">
+ <unit bldFile="mw/appinstall/appinstall_plat/iaupdate_api/group"/>
+ </component>
+ <component name="task_plugin_api" long-name="Task Plugin API" filter="s60" class="api">
+ <unit bldFile="mw/appinstall/appinstall_plat/task_plugin_api/group"/>
+ </component>
+ <component name="sw_installer_common_ui_api" long-name="SW Installer Common UI API" filter="s60" class="api">
+ <unit bldFile="mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
+ </component>
+ <component name="sw_installer_launcher_api" long-name="SW Installer Launcher API" filter="s60" class="api">
+ <unit bldFile="mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
+ </component>
+ <component name="task_management_api" long-name="Task Management API" filter="s60" class="api">
+ <unit bldFile="mw/appinstall/appinstall_plat/task_management_api/group"/>
+ </component>
+ <component name="sw_installer_ui_plugin_api" long-name="SW Installer UI Plugin API" filter="s60" class="api">
+ <unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
+ </component>
+ <component name="sw_installer_cr_keys" long-name="SW Installer CR Keys" filter="s60" class="api">
+ <unit bldFile="mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
+ </component>
+ <component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" class="api">
+ <unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
+ </component>
+ <component name="appmngr2runtimeapi" long-name="Application Manager 2 Runtime Plugin API" filter="s60" class="api">
+ <unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
+ </component>
+ </collection>
+ <collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
+ <component name="startup_list_management_api" long-name="Startup List Management API" filter="s60" class="api">
+ <unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
+ </component>
+ </collection>
<collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
<component name="ncdengine_engine" filter="s60" long-name="NCD Engine" introduced="^1">
@@ -4815,18 +7449,42 @@
</component>
</collection>
<collection name="appinstall_info" long-name="Application Installation Info" level="api">
- <component name="appinstall_pub" filter="s60" long-name="Application Installation Public Interfaces" class="api">
- <unit bldFile="mw/appinstall/appinstall_pub/group"/>
- </component>
- <component name="appinstall_plat" filter="s60" long-name="Application Installation Platform Interfaces" class="api">
- <unit bldFile="mw/appinstall/appinstall_plat/group"/>
- </component>
<component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="^2" purpose="development" class="config PC">
<unit mrp="mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
</component>
</collection>
</block>
<block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
+ <collection name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" level="specific"/>
+ <collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
+ <component name="rtsecuritymanager_common_api" long-name="Runtime Security Manager Common API" filter="s60" class="api">
+ <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
+ </component>
+ <component name="rtsecuritymanager_utility_api" long-name="Runtime Security Manager Utility API" filter="s60" class="api">
+ <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
+ </component>
+ <component name="rtsecuritymanager_client_api" long-name="Runtime Security Manager Client API" filter="s60" class="api">
+ <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
+ </component>
+ <component name="liw_provider_utility_api" long-name="LIW Provider Utility API" filter="s60" class="api">
+ <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
+ </component>
+ <component name="liw_service_interface_base_api" long-name="LIW Service Interface Base API" filter="s60" class="api">
+ <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
+ </component>
+ <component name="liw_service_interface_menu_api" long-name="LIW Service Interface Menu API" filter="s60" class="api">
+ <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
+ </component>
+ <component name="liw_criteria_api" long-name="LIW Criteria API" filter="s60" class="api">
+ <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
+ </component>
+ <component name="liw_generic_parameter_api" long-name="LIW Generic Parameter API" filter="s60" class="api">
+ <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
+ </component>
+ <component name="liw_service_handler_api" long-name="LIW Service Handler API" filter="s60" class="api">
+ <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
+ </component>
+ </collection>
<collection name="rtsecuritymanager" long-name="Runtime Security Manager" level="server">
<component name="rtsecuritymanagerutil" filter="s60" long-name="Runtime Security Manager Util">
<unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
@@ -4847,14 +7505,6 @@
<unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
</component>
</collection>
- <collection name="serviceapifw_info" long-name="Service API Framework Info" level="specific">
- <component name="serviceapifw_plat" filter="s60" long-name="Service API Framework Platform Interfaces" class="api">
- <unit bldFile="mw/serviceapifw/serviceapifw_plat/group"/>
- </component>
- <component name="serviceapifw_pub" filter="s60" long-name="Service API Framework Public Interfaces" class="api">
- <unit bldFile="mw/serviceapifw/serviceapifw_pub/group"/>
- </component>
- </collection>
</block>
<block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
<!-- should break up this collection into something meaningful -->
@@ -4902,13 +7552,83 @@
</collection>
</block>
<block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
+ <collection name="web_pub" long-name="Web Public Interfaces" level="specific">
+ <component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
+ <unit bldFile="mw/web/web_pub/browser_control_api/group"/>
+ </component>
+ <component name="download_mgr_client_api" long-name="Download Manager Client API" filter="s60" class="api">
+ <unit bldFile="mw/web/web_pub/download_mgr_client_api/group"/>
+ </component>
+ <component name="download_mgr_ui_api" long-name="Download Manager UI Library API" filter="s60" class="api">
+ <unit bldFile="mw/web/web_pub/download_mgr_ui_api/group"/>
+ </component>
+ <component name="favourites_engine_api" long-name="Favourites Engine API" filter="s60" class="api">
+ <unit bldFile="mw/web/web_pub/favourites_engine_api/group"/>
+ </component>
+ <component name="browser_plugin_api" long-name="Browser Plug-in API" filter="s60" class="api">
+ <unit bldFile="mw/web/web_pub/browser_plugin_api/group"/>
+ </component>
+ <component name="settings_api" long-name="Settings API" filter="s60" class="api">
+ <unit bldFile="mw/web/web_pub/settings_api/group"/>
+ </component>
+ </collection>
+ <collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
+ <component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
+ <unit bldFile="mw/web/web_plat/browser_platform_api/inc/browser_platform_variant.hrh"/>
+ </component>
+ <component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
+ <unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
+ </component>
+ <component name="browser_dialogs_provider_api" long-name="Browser Dialogs Provider API" filter="s60" class="api">
+ <unit bldFile="mw/web/web_plat/browser_dialogs_provider_api/group"/>
+ </component>
+ <component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
+ <unit bldFile="mw/web/web_plat/browser_platform_api/group"/>
+ </component>
+ <component name="cod_handler_api" long-name="COD Handler API" filter="s60" class="api">
+ <unit bldFile="mw/web/web_plat/cod_handler_api/group"/>
+ </component>
+ <component name="connection_manager_api" long-name="Connection Manager API" filter="s60" class="api">
+ <unit bldFile="mw/web/web_plat/connection_manager_api/group"/>
+ </component>
+ <component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
+ <unit bldFile="mw/web/web_plat/cxml_library_api/group"/>
+ </component>
+ <component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
+ <unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
+ </component>
+ <component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
+ <unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
+ </component>
+ <component name="launcher_api" long-name="Launcher API" filter="s60" class="api">
+ <unit bldFile="mw/web/web_plat/launcher_api/group"/>
+ </component>
+ <component name="multipart_parser_api" long-name="Multipart Parser API" filter="s60" class="api">
+ <unit bldFile="mw/web/web_plat/multipart_parser_api/group"/>
+ </component>
+ <component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
+ <unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
+ </component>
+ <component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
+ <unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
+ </component>
+ <component name="scriptable_plugin_api" long-name="Scriptable Plugin API" filter="s60" class="api">
+ <unit bldFile="mw/web/web_plat/scriptable_plugin_api/group"/>
+ </component>
+ <component name="webutils_api" long-name="Web Utils API" filter="s60" class="api">
+ <unit bldFile="mw/web/web_plat/webutils_api/group"/>
+ </component>
+ <component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
+ <unit bldFile="mw/web/web_plat/widget_registry_api/group"/>
+ </component>
+ <component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
+ <unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
+ </component>
+ <component name="stmgesturefw_api" long-name="State Machine Gesture Framework API " filter="s60" class="api">
+ <unit bldFile="mw/web/web_plat/stmgesturefw_api/group"/>
+ </component>
+ </collection>
<collection name="web_info" long-name="Web Info" level="specific">
- <component name="web_plat" filter="s60" long-name="Web Platform Interfaces" class="api">
- <unit bldFile="mw/web/web_plat/group"/>
- </component>
- <component name="web_pub" filter="s60" long-name="Web Public Interfaces" class="api">
- <unit bldFile="mw/web/web_pub/group"/>
- </component>
<component name="web_build" filter="s60" long-name="Web Build">
<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
<unit bldFile="mw/web/group"/>
@@ -5069,6 +7789,29 @@
</collection>
</block>
<block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
+ <collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
+ <component name="web_service_description_api" long-name="Web Service Description API" filter="s60" class="api">
+ <unit bldFile="mw/websrv/websrv_pub/web_service_description_api/group"/>
+ </component>
+ <component name="web_service_connection_api" long-name="Web Service Connection API" filter="s60" class="api">
+ <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/group"/>
+ </component>
+ <component name="web_service_manager_api" long-name="Web Service Manager API" filter="s60" class="api">
+ <unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/group"/>
+ </component>
+ <component name="hostlet_connection_api" long-name="Hostlet Connection API" filter="s60" class="api">
+ <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/group"/>
+ </component>
+ <component name="web_service_messaging_api" long-name="Web Service Messaging API" filter="s60" class="api">
+ <unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/group"/>
+ </component>
+ <component name="xml_extensions_api" long-name="XML Extensions API" filter="s60" class="api">
+ <unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/group"/>
+ </component>
+ <component name="xml_fragment_api" long-name="XML Fragment API" filter="s60" class="api">
+ <unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/group"/>
+ </component>
+ </collection>
<collection name="webservices" long-name="Web Services Framework" level="generic">
<!-- consider breaking this collection into more meaningful subsets -->
<component name="wsnotifierplugins" filter="s60" long-name="WS Notifier Plugins" plugin="Y">
@@ -5165,9 +7908,6 @@
<!-- need to include common .hrh in each unit -->
<unit bldFile="mw/websrv/group"/>
</component>
- <component name="websrv_pub" filter="s60" long-name="Web Services Public Interfaces" class="api">
- <unit bldFile="mw/websrv/websrv_pub/group"/>
- </component>
</collection>
</block>
<block name="platformtools" level="generic" long-name="Platform Tools">
@@ -5181,6 +7921,19 @@
</collection>
</block>
<block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
+ <collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="if">
+ <component name="third_party_bitmap_palette_api" long-name="Third Party Bitmap Palette API" filter="s60" class="api">
+ <unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
+ </component>
+ </collection>
+ <collection name="uitools_plat" long-name="UI Tools Platform Interfaces" level="if">
+ <component name="cdl_api" long-name="CDL API" filter="s60" class="api">
+ <unit bldFile="mw/uitools/uitools_plat/cdl_api/group"/>
+ </component>
+ <component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
+ <unit bldFile="mw/uitools/uitools_plat/layout_system_private_api/group"/>
+ </component>
+ </collection>
<collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
<!-- collection is actually a component. Needs to be moved down a directory -->
<component name="cdlcompilertoolkit_build" filter="s60" long-name="CDL Compiler Toolkit Build">
@@ -5224,18 +7977,23 @@
<unit bldFile="mw/uitools/svgtencoder/svgtenc/standalone/group"/>
</component>
</collection>
- <collection name="uitools_info" long-name="UI Tools Info" level="if">
- <component name="uitools_plat" filter="s60" long-name="UI Tools Platform Interfaces" class="api">
- <unit bldFile="mw/uitools/uitools_plat/group"/>
- </component>
- <component name="uitools_pub" filter="s60" long-name="UI Tools Public Interfaces" class="api">
- <unit bldFile="mw/uitools/uitools_pub/group"/>
- </component>
- </collection>
</block>
</layer>
<layer name="app" long-name="Applications" levels="services apps">
<block name="location" level="apps" long-name="Location Apps" levels="ui events loc apps">
+ <collection name="loc_plat" long-name="Location Apps Platform Interfaces" level="apps">
+ <component name="location_centre_api" long-name="Location Centre API" introduced="^3" filter="s60" class="api">
+ <unit bldFile="app/location/loc_plat/location_centre_api/group"/>
+ </component>
+ </collection>
+ <collection name="loc_pub" long-name="Location Apps Public Interfaces" level="apps">
+ <component name="landmarks_ui_selector_api" long-name="Landmarks UI Selector API" filter="s60" class="api">
+ <unit bldFile="app/location/loc_pub/landmarks_ui_selector_api/group"/>
+ </component>
+ <component name="landmarks_ui_addedit_api" long-name="Landmarks UI Add/Edit API" filter="s60" class="api">
+ <unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/group"/>
+ </component>
+ </collection>
<collection name="basiclocationinfodisplay" long-name="Basic Location Info Display" level="ui">
<component name="blid" filter="s60" long-name="Basic Location Info Display Build">
<unit bldFile="app/location/basiclocationinfodisplay/blid/group"/>
@@ -5337,16 +8095,19 @@
<unit bldFile="app/location/locationcentre/group"/>
</component>
</collection>
- <collection name="location_info" long-name="Location Apps Info" level="loc">
- <component name="loc_pub" filter="s60" long-name="Location Apps Public Interfaces" class="api">
- <unit bldFile="app/location/loc_pub/group"/>
- </component>
- <component name="loc_plat" filter="s60" long-name="Location Apps Platform Interfaces" introduced="^3" class="api">
- <unit bldFile="app/location/loc_plat/group"/>
- </component>
- </collection>
</block>
<block name="mmsharinguis" level="services" long-name="Multimedia Sharing UIs" levels="base plugin if">
+ <collection name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" level="if">
+ <component name="multimedia_sharing_settings_api" long-name="Multimedia Sharing Settings API" filter="s60" class="api">
+ <unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_settings_api/group"/>
+ </component>
+ <component name="multimedia_sharing_resource_api" long-name="Multimedia Sharing Resource API" filter="s60" class="api">
+ <unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_resource_api/group"/>
+ </component>
+ <component name="multimedia_sharing_manager_api" long-name="Multimedia Sharing Manager API" filter="s60" class="api">
+ <unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/group"/>
+ </component>
+ </collection>
<collection name="mmsharing" long-name="Multimedia Sharing" level="base">
<component name="mmshavailability" filter="s60" long-name="Multimedia Sharing Availability">
<unit bldFile="app/mmsharinguis/mmsharing/mmshavailability/group"/>
@@ -5356,7 +8117,7 @@
</component>
<!-- consider putting client and server in the same component -->
<component name="mmshmanagercli" filter="s60" long-name="Multimedia Sharing Manager Client">
- <unit bldFile="app/mmsharinguis/mmsharing/mmshmanagercli/group"/>
+ <unit bldFile="app/mmsharinguis/mmsharing/mmshmanagercli/group" filter="!test"/>
</component>
<component name="mmshmanagersrv" filter="s60" long-name="Multimedia Sharing Manager Server">
<unit bldFile="app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
@@ -5365,7 +8126,7 @@
<unit bldFile="app/mmsharinguis/mmsharing/mmshengine/group"/>
</component>
<component name="mmshui" filter="s60" long-name="Multimedia Sharing UI">
- <!-- can only have one unti: need to #include one from the other if it's needed -->
+ <!-- can only have one unit: need to #include one from the other if it's needed -->
<unit bldFile="app/mmsharinguis/mmsharing/mmshui/group"/>
<unit bldFile="app/mmsharinguis/mmsharing/mmshui/help/group"/>
</component>
@@ -5395,18 +8156,68 @@
<!-- consider distributing to other components -->
<unit bldFile="app/mmsharinguis/group"/>
</component>
- <component name="mmsharinguis_plat" filter="s60" long-name="Multimedia Sharing UIs Platform Interfaces" class="api">
- <unit bldFile="app/mmsharinguis/mmsharinguis_plat/group"/>
- </component>
</collection>
</block>
<block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
+ <collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="app">
+ <component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
+ <unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
+ </component>
+ <component name="telephony_comms_information_api" long-name="Telephony Comms Information API" filter="s60" class="api">
+ <unit bldFile="app/phone/phone_plat/telephony_comms_information_api/group"/>
+ </component>
+ <component name="telephony_information_api" long-name="Telephony Information API" filter="s60" class="api">
+ <unit bldFile="app/phone/phone_plat/telephony_information_api/group"/>
+ </component>
+ <component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" class="api">
+ <unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
+ </component>
+ <component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" class="api">
+ <unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
+ </component>
+ <component name="telephony_video_mailbox_settings_api" long-name="Telephony Video Mailbox Settings API" filter="s60" class="api">
+ <unit bldFile="app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
+ </component>
+ <component name="telephony_configuration_api" long-name="Telephony Configuration API" filter="s60" class="api">
+ <unit bldFile="app/phone/phone_plat/telephony_configuration_api/group"/>
+ </component>
+ <component name="telephony_microphone_mute_status_api" long-name="Telephony Microphone Mute Status API" filter="s60" class="api">
+ <unit bldFile="app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
+ </component>
+ <component name="dialer_keypad_api" long-name="Dialer Keypad API" filter="s60" class="api">
+ <unit bldFile="app/phone/phone_plat/dialer_keypad_api/group"/>
+ </component>
+ <component name="telephony_logging_extension_api" long-name="Telephony Logging Extension API" filter="s60" class="api">
+ <unit bldFile="app/phone/phone_plat/telephony_logging_extension_api/group"/>
+ </component>
+ <component name="telephony_matching_extension_api" long-name="Telephony Matching Extension API" filter="s60" class="api">
+ <unit bldFile="app/phone/phone_plat/telephony_matching_extension_api/group"/>
+ </component>
+ <component name="telephony_bubble_extension_api" long-name="Telephony Bubble Extension API" filter="s60" class="api">
+ <unit bldFile="app/phone/phone_plat/telephony_bubble_extension_api/group"/>
+ </component>
+ <component name="telephony_menu_extension_api" long-name="Telephony Menu Extension API" filter="s60" class="api">
+ <unit bldFile="app/phone/phone_plat/telephony_menu_extension_api/group"/>
+ </component>
+ <component name="phone_application_commands_api" long-name="Phone Application Commands API" filter="s60" class="api">
+ <unit bldFile="app/phone/phone_plat/phone_application_commands_api/group"/>
+ </component>
+ <component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
+ <unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
+ </component>
+ <component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
+ <unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
+ </component>
+ <component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
+ <unit bldFile="app/phone/phone_plat/video_telephony_mediator_api/group"/>
+ </component>
+ </collection>
<collection name="phoneapp" long-name="Phone Application" level="app">
<component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
<unit bldFile="app/phone/phoneapp/blacklist/group"/>
</component>
<component name="phoneui" filter="s60" long-name="Phone UI">
- <unit bldFile="app/phone/phoneapp/phoneui/group"/>
+ <unit bldFile="app/phone/phoneapp/phoneui/group" filter="!test"/>
</component>
<component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
<unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
@@ -5466,7 +8277,7 @@
</collection>
<collection name="phoneuis" long-name="Phone UIs" level="ui">
<component name="dialer" filter="s60" long-name="Dialer">
- <unit bldFile="app/phone/phoneuis/dialer/group"/>
+ <unit bldFile="app/phone/phoneuis/dialer/group" filter="!test"/>
</component>
<component name="easydialing" filter="s60" long-name="Easy Dialing Plugin" introduced="^3" plugin="Y">
<unit bldFile="app/phone/phoneuis/easydialing/group"/>
@@ -5487,11 +8298,6 @@
<unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
</component>
</collection>
- <collection name="phone_info" long-name="Phone Apps Info" level="app">
- <component name="phone_plat" filter="s60" long-name="Phone Apps Platform Interfaces" class="api">
- <unit bldFile="app/phone/phone_plat/group"/>
- </component>
- </collection>
<collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
<component name="telbranding" filter="s60" long-name="Tel Branding" introduced="^2" plugin="Y">
<unit bldFile="app/phone/phoneplugins/telbranding/group"/>
@@ -5499,6 +8305,14 @@
</collection>
</block>
<block name="videotelephony" level="apps" long-name="Video Telephony Apps" levels="engine plugin prot ui">
+ <collection name="videotelephony_plat" long-name="VT Apps Platform Interfaces" level="ui">
+ <component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" class="api">
+ <unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_control_mediator_api/group"/>
+ </component>
+ <component name="video_telephony_media_configuration_api" long-name="Video Telephony Media Configuration API" filter="s60" class="api">
+ <unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_media_configuration_api/group"/>
+ </component>
+ </collection>
<collection name="vtengines" long-name="Video Telephony Engines" level="engine">
<component name="videoteleng" filter="s60" long-name="Video Telephony Engine">
<unit bldFile="app/videotelephony/vtengines/videoteleng/Group"/>
@@ -5526,13 +8340,28 @@
<unit bldFile="app/videotelephony/vtprotocolsstub/group" filter="sf_build"/>
</component>
</collection>
- <collection name="videotelephony_info" long-name="VT Apps Info" level="ui">
- <component name="videotelephony_plat" filter="s60" long-name="VT Apps Platform Interfaces" class="api">
- <unit bldFile="app/videotelephony/videotelephony_plat/group"/>
- </component>
- </collection>
</block>
<block name="iptelephony" level="apps" long-name="IP Telephony" levels="eng plugin util ui">
+ <collection name="iptel_plat" long-name="IP Telephony Platform Interfaces" level="ui">
+ <component name="richcallsettingsengine_api" long-name="Rich Call Settings Engine API" introduced="^2" filter="s60" class="api">
+ <unit bldFile="app/iptelephony/iptel_plat/richcallsettingsengine_api/group"/>
+ </component>
+ <component name="cch_client_api" long-name="CCH Client API" introduced="^2" filter="s60" class="api">
+ <unit bldFile="app/iptelephony/iptel_plat/cch_client_api/group"/>
+ </component>
+ <component name="cch_server_api" long-name="CCH Server API" introduced="^2" filter="s60" class="api">
+ <unit bldFile="app/iptelephony/iptel_plat/cch_server_api/group"/>
+ </component>
+ <component name="csc_settingsui_api" long-name="CSC Settings UI API" introduced="^2" filter="s60" class="api">
+ <unit bldFile="app/iptelephony/iptel_plat/csc_settingsui_api/group"/>
+ </component>
+ <component name="vccpropertyhandler_api" long-name="VCC Property Handler API" introduced="^2" filter="s60" class="api">
+ <unit bldFile="app/iptelephony/iptel_plat/vccpropertyhandler_api/group"/>
+ </component>
+ <component name="vcc_api" long-name="VCC API" introduced="^2" filter="s60" class="api">
+ <unit bldFile="app/iptelephony/iptel_plat/vcc_api/group"/>
+ </component>
+ </collection>
<collection name="iptelcommsconfig" long-name="IP Telephony Comms Config" level="ui">
<component name="cscgsplugin" filter="s60" long-name="CSC GS Plugin" introduced="^2" plugin="Y">
<unit bldFile="app/iptelephony/commsconfig/cscgsplugin/group"/>
@@ -5639,13 +8468,16 @@
<unit bldFile="app/iptelephony/callcontinuity/group"/>
</component>
</collection>
- <collection name="iptelephony_info" long-name="IP Telephony Info" level="ui">
- <component name="iptel_plat" filter="s60" long-name="IP Telephony Platform Interfaces" introduced="^2" class="api">
- <unit bldFile="app/iptelephony/iptel_plat/group"/>
- </component>
- </collection>
</block>
<block name="settingsuis" level="services" long-name="Settings UIs" levels="rsc ui">
+ <collection name="devmngt_plat" long-name="Settings UIs Platform Interfaces" level="ui">
+ <component name="default_app_client_api" long-name="Default App Client API" introduced="^1" filter="s60" class="api">
+ <unit bldFile="app/settingsuis/devmngt_plat/default_app_client_api/group"/>
+ </component>
+ <component name="services_db_api" long-name="Services DB API" introduced="^1" filter="s60" class="api">
+ <unit bldFile="app/settingsuis/devmngt_plat/services_db_api/group" filter="!test"/>
+ </component>
+ </collection>
<collection name="defaultapplicationsettings" long-name="Default Application Settings" level="rsc">
<component name="services_db" filter="s60" long-name="Services Database" introduced="^1">
<unit bldFile="app/settingsuis/defaultapplicationsettings/services_db/group"/>
@@ -5669,16 +8501,25 @@
<unit bldFile="app/settingsuis/systemswuis/touchscreencalib/group"/>
</component>
</collection>
- <collection name="settingsuis_info" long-name="Settings UIs Info" level="ui">
- <component name="devmngt_plat" filter="s60" long-name="Settings UIs Platform Interfaces" introduced="^1" class="api">
- <unit bldFile="app/settingsuis/devmngt_plat/group"/>
- </component>
- <component name="devmngt_pub" filter="s60" long-name="Settings UIs Public Interfaces" introduced="^1" class="api">
- <unit bldFile="app/settingsuis/devmngt_pub/group"/>
- </component>
- </collection>
</block>
<block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin app">
+ <collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
+ <component name="oma_ds_presync_plugin_api" long-name="OMA DS PreSync Plugin API" filter="s60" class="api">
+ <unit bldFile="app/contentcontrol/contentctrl_plat/oma_ds_presync_plugin_api/group"/>
+ </component>
+ <component name="ds_agenda_handler_plugin_api" long-name="DS Agenda Handler Plugin API" filter="s60" class="api">
+ <unit bldFile="app/contentcontrol/contentctrl_plat/ds_agenda_handler_plugin_api/group"/>
+ </component>
+ <component name="ds_folder_util_api" long-name="DS Folder Util API" filter="s60" class="api">
+ <unit bldFile="app/contentcontrol/contentctrl_plat/ds_folder_util_api/group"/>
+ </component>
+ <component name="adapter_customization_api" long-name="Adapter Customization API" filter="s60" class="api">
+ <unit bldFile="app/contentcontrol/contentctrl_plat/adapter_customization_api/group"/>
+ </component>
+ <component name="ds_data_modification_api" long-name="DS Data Modification API" filter="s60" class="api">
+ <unit bldFile="app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
+ </component>
+ </collection>
<collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
<!-- Component at wrong rank, should move down a directory -->
<component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
@@ -5693,11 +8534,6 @@
<unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
</component>
</collection>
- <collection name="contentcontrol_info" long-name="Content Control Daemons Info" level="app">
- <component name="contentctrl_plat" filter="s60" long-name="Content Control Daemons Platforn Interfaces" class="api">
- <unit bldFile="app/contentcontrol/contentctrl_plat/group"/>
- </component>
- </collection>
</block>
<block name="devicecontrol" level="services" long-name="Device Control Daemons" levels="oma mid app">
<collection name="devicediagnostics" long-name="Device Diagnostics" level="app">
@@ -5817,6 +8653,11 @@
</collection>
</block>
<block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
+ <collection name="files_plat" long-name="File Manager Apps Platform Interfaces" level="apps">
+ <component name="memory_scan_popup_ui_api" long-name="Memory Scan Popup UI API" filter="s60" class="api">
+ <unit bldFile="app/files/files_plat/memory_scan_popup_ui_api/group"/>
+ </component>
+ </collection>
<collection name="deviceencryption" long-name="Device Encryption" level="support">
<!-- this is either needs to be broken up into idependent bld.infs, or it's really a component and should move down a directory -->
<component name="devencnotifplugin" filter="s60" long-name="Device Encryption Notifier Plugin" introduced="^3" plugin="Y">
@@ -5852,11 +8693,6 @@
<unit bldFile="app/files/filesystemuis/memstatepopup/group"/>
</component>
</collection>
- <collection name="files_info" long-name="File Manager Apps Info" level="apps">
- <component name="files_plat" filter="s60" long-name="File Manager Apps Platform Interfaces" class="api">
- <unit bldFile="app/files/files_plat/group"/>
- </component>
- </collection>
</block>
<block name="utils" level="apps" long-name="Utility Apps" levels="app">
<collection name="extras" long-name="Extras" level="app">
@@ -5872,6 +8708,175 @@
</collection>
</block>
<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
+ <collection name="contacts_pub" long-name="Contacts Apps Public Interfaces" level="ui">
+ <component name="phonebook_fetch_ui_api" long-name="Phonebook Fetch UI API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_pub/phonebook_fetch_ui_api/group"/>
+ </component>
+ <component name="phonebook_data_management_api" long-name="Phonebook Data Management API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_pub/phonebook_data_management_api/group"/>
+ </component>
+ <component name="phonebook_vcard_importexport_api" long-name="Phonebook vCard Import/Export API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_pub/phonebook_vcard_importexport_api/group"/>
+ </component>
+ <component name="phonebook_data_addedit_ui_api" long-name="Phonebook Data Add/Edit UI API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_pub/phonebook_data_addedit_ui_api/group"/>
+ </component>
+ <component name="phonebook_ui_utilities_api" long-name="Phonebook UI Utilities API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_pub/phonebook_ui_utilities_api/group"/>
+ </component>
+ <component name="phonebook_thumbnail_operation_api" long-name="Phonebook Thumbnail Operation API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_pub/phonebook_thumbnail_operation_api/group"/>
+ </component>
+ <component name="speed_dial_utility_control_api" long-name="Speed Dial Utility Control API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_pub/speed_dial_utility_control_api/group"/>
+ </component>
+ </collection>
+ <collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
+ <component name="virtual_phonebook_store_api" long-name="Virtual Phonebook Store API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_store_api/group"/>
+ </component>
+ <component name="virtual_phonebook_sim_services_api" long-name="Virtual Phonebook SIM Services API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_sim_services_api/group"/>
+ </component>
+ <component name="virtual_phonebook_configuration_api" long-name="Virtual Phonebook Configuration API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_configuration_api/group"/>
+ </component>
+ <component name="virtual_phonebook_copy_policy_api" long-name="Virtual Phonebook Copy Policy API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_copy_policy_api/group"/>
+ </component>
+ <component name="virtual_phonebook_policy_api" long-name="Virtual Phonebook Policy API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_policy_api/group"/>
+ </component>
+ <component name="virtual_phonebook_engine_api" long-name="Virtual Phonebook Engine API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_engine_api/group"/>
+ </component>
+ <component name="virtual_phonebook_migration_support_api" long-name="Virtual Phonebook Migration Support API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_migration_support_api/group"/>
+ </component>
+ <component name="virtual_phonebook_view_definition_api" long-name="Virtual Phonebook View Definition API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_view_definition_api/group"/>
+ </component>
+ <component name="virtual_phonebook_vcard_api" long-name="Virtual Phonebook vCard API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_vcard_api/group"/>
+ </component>
+ <component name="cms_contactor_api" long-name="CMS Contactor API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/cms_contactor_api/group"/>
+ </component>
+ <component name="contactpresence_api" long-name="Contact Presence API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/contactpresence_api/group"/>
+ </component>
+ <component name="presence_cache_api" long-name="Presence Cache API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/presence_cache_api/group"/>
+ </component>
+ <component name="phonebook_internal_common_api" long-name="Phonebook Internal Common API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/phonebook_internal_common_api/group"/>
+ </component>
+ <component name="phonebook_internal_appfw_api" long-name="Phonebook Internal App Framework API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/phonebook_internal_appfw_api/group"/>
+ </component>
+ <component name="phonebook_internal_data_management_api" long-name="Phonebook Internal Data Management API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/phonebook_internal_data_management_api/group"/>
+ </component>
+ <component name="phonebook_2_xsp_extension_manager_api" long-name="Phonebook 2 xSP Extension Manager API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_extension_manager_api/group"/>
+ </component>
+ <component name="phonebook_ui_controls_api" long-name="Phonebook UI Controls API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/phonebook_ui_controls_api/group"/>
+ </component>
+ <component name="phonebook_2_image_management_api" long-name="Phonebook 2 Image Management API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/phonebook_2_image_management_api/group"/>
+ </component>
+ <component name="phonebook_extension_api" long-name="Phonebook Extension API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/phonebook_extension_api/group"/>
+ </component>
+ <component name="phonebook_public_constants_api" long-name="Phonebook Public Constants API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/phonebook_public_constants_api/group"/>
+ </component>
+ <component name="phonebook_internal_ui_utilities_api" long-name="Phonebook Internal UI Utilities API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/phonebook_internal_ui_utilities_api/group"/>
+ </component>
+ <component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/logs_engine_api_extensions/group"/>
+ </component>
+ <component name="phonebook_thumbnails_api" long-name="Phonebook Thumbnails API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/phonebook_thumbnails_api/group"/>
+ </component>
+ <component name="phonebook_2_icon_api" long-name="Phonebook 2 Icon API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/phonebook_2_icon_api/group"/>
+ </component>
+ <component name="phonebook_engine_extension_api" long-name="Phonebook Engine Extension API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/phonebook_engine_extension_api/group"/>
+ </component>
+ <component name="phonebook_2_store_configuration_management_api" long-name="Phonebook 2 Store Configuration Management API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/phonebook_2_store_configuration_management_api/group"/>
+ </component>
+ <component name="logs_ui_command_line_api" long-name="Logs UI Command Line API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/logs_ui_command_line_api/group"/>
+ </component>
+ <component name="speed_dial_dialogs_api" long-name="Speed Dial Dialogs API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/speed_dial_dialogs_api/group"/>
+ </component>
+ <component name="phonebook_2_xsp_view_activation_api" long-name="Phonebook 2 xSP View Activation API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_view_activation_api/group"/>
+ </component>
+ <component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/logs_timers_api/group"/>
+ </component>
+ <component name="phonebook_2_ui_extension_definition_api" long-name="Phonebook 2 UI Extension Definition API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_definition_api/group"/>
+ </component>
+ <component name="phonebook_2_common_ui_api" long-name="Phonebook 2 Common UI API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/phonebook_2_common_ui_api/group"/>
+ </component>
+ <component name="phonebook_2_ui_extension_api" long-name="Phonebook 2 UI Extension API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_api/group"/>
+ </component>
+ <component name="phonebook_2_store_property_api" long-name="Phonebook 2 Store Property API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/phonebook_2_store_property_api/group"/>
+ </component>
+ <component name="phonebook_2_ui_extension_plugin_api" long-name="Phonebook 2 UI Extension Plug-In API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_plugin_api/group"/>
+ </component>
+ <component name="phonebook_2_ui_controls_api" long-name="Phonebook 2 UI Controls API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_controls_api/group"/>
+ </component>
+ <component name="phonebook_2_thin_ui_extension_plugin_api" long-name="Phonebook 2 Thin UI Extension Plugin API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/phonebook_2_thin_ui_extension_plugin_api/group"/>
+ </component>
+ <component name="phonebook_2_commands_api" long-name="Phonebook 2 Commands API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/phonebook_2_commands_api/group"/>
+ </component>
+ <component name="phonebook_2_presentation_api" long-name="Phonebook 2 Presentation API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/phonebook_2_presentation_api/group"/>
+ </component>
+ <component name="phonebook_2_ui_utilities_api" long-name="Phonebook 2 UI Utilities API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_utilities_api/group"/>
+ </component>
+ <component name="phonebook_2_contact_related_icon_customization_api" long-name="Phonebook 2 Contact Related Icon Customization API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/phonebook_2_contact_related_icon_customization_api/group"/>
+ </component>
+ <component name="cca_launch_api" long-name="CCA Launch API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/cca_launch_api/group"/>
+ </component>
+ <component name="cca_view_plugin_api" long-name="CCA View Plugin API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/cca_view_plugin_api/group"/>
+ </component>
+ <component name="predictivesearch_client_api" long-name="Predictive Search Client API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/predictivesearch_client_api/group"/>
+ </component>
+ <component name="predictivesearch_utils_api" long-name="Predictive Search Utils API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/predictivesearch_utils_api/group"/>
+ </component>
+ <component name="predictivesearch_adapters_api" long-name="Predictive Search Adapters API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/predictivesearch_adapters_api/group"/>
+ </component>
+ <component name="predictivesearch_algorithm_api" long-name="Predictive Search Algorithm API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/predictivesearch_algorithm_api/group"/>
+ </component>
+ <component name="phonebook_2_rcl_api" long-name="Phonebook 2 RCL API" filter="s60" class="api">
+ <unit bldFile="app/contacts/contacts_plat/phonebook_2_rcl_api/group"/>
+ </component>
+ </collection>
<collection name="contactextensions" long-name="Contacts Extensions" level="services">
<component name="predefinedcontacts" filter="s60" long-name="Predefined Contacts">
<unit bldFile="app/contacts/contactextensions/predefinedcontacts/group"/>
@@ -5958,18 +8963,82 @@
</component>
</collection>
<collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
- <component name="contacts_plat" filter="s60" long-name="Contacts Apps Platform Interfaces" class="api">
- <unit bldFile="app/contacts/contacts_plat/group"/>
- </component>
- <component name="contacts_pub" filter="s60" long-name="Contacts Apps Public Interfaces" class="api">
- <unit bldFile="app/contacts/contacts_pub/group"/>
- </component>
<component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
<unit mrp="app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
</component>
</collection>
</block>
<block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
+ <collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
+ <component name="meeting_request_mailbox_utilities_api" long-name="Meeting Request Mailbox Utilities API" filter="s60" class="api">
+ <unit bldFile="app/organizer/organizer_plat/meeting_request_mailbox_utilities_api/group"/>
+ </component>
+ <component name="meeting_request_uids_api" long-name="Meeting Request UIDs API" filter="s60" class="api">
+ <unit bldFile="app/organizer/organizer_plat/meeting_request_uids_api/group"/>
+ </component>
+ <component name="calendar_exporter_api" long-name="Calendar Exporter API" filter="s60" class="api">
+ <unit bldFile="app/organizer/organizer_plat/calendar_exporter_api/group"/>
+ </component>
+ <component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api">
+ <unit bldFile="app/organizer/organizer_plat/agenda_versit_2_api/group"/>
+ </component>
+ <component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" class="api">
+ <unit bldFile="app/organizer/organizer_plat/calendar_importer_api/group"/>
+ </component>
+ <component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" class="api">
+ <unit bldFile="app/organizer/organizer_plat/calendar_launcher_api/group"/>
+ </component>
+ <component name="calendar_common_utils_api" long-name="Calendar Common Utils API" filter="s60" class="api">
+ <unit bldFile="app/organizer/organizer_plat/calendar_common_utils_api/group"/>
+ </component>
+ <component name="searchfw_launcher_api" long-name="Search Framework Launcher API" filter="s60" class="api">
+ <unit bldFile="app/organizer/organizer_plat/searchfw_launcher_api/group"/>
+ </component>
+ <component name="alarm_const_api" long-name="Alarm Const API" filter="s60" class="api">
+ <unit bldFile="app/organizer/organizer_plat/alarm_const_api/group"/>
+ </component>
+ <component name="alarm_ui_external_control_api" long-name="Alarm UI External Control API" filter="s60" class="api">
+ <unit bldFile="app/organizer/organizer_plat/alarm_ui_external_control_api/group"/>
+ </component>
+ <component name="calendar_settings_keys_api" long-name="Calendar Settings Keys API" filter="s60" class="api">
+ <unit bldFile="app/organizer/organizer_plat/calendar_settings_keys_api/group"/>
+ </component>
+ <component name="calendar_tones_settings_keys_api" long-name="Calendar Tones Settings Keys API" filter="s60" class="api">
+ <unit bldFile="app/organizer/organizer_plat/calendar_tones_settings_keys_api/group"/>
+ </component>
+ <component name="clock_settings_api" long-name="Clock Settings API" filter="s60" class="api">
+ <unit bldFile="app/organizer/organizer_plat/clock_settings_api/group"/>
+ </component>
+ <component name="common_alarm_editor_api" long-name="Common Alarm Editor API" filter="s60" class="api">
+ <unit bldFile="app/organizer/organizer_plat/common_alarm_editor_api/group"/>
+ </component>
+ <component name="alarm_ui_secondary_display_api" long-name="Alarm UI Secondary Display API" filter="s60" class="api">
+ <unit bldFile="app/organizer/organizer_plat/alarm_ui_secondary_display_api/group"/>
+ </component>
+ <component name="searchui_launcher_api" long-name="Search UI Launcher API" filter="s60" class="api">
+ <unit bldFile="app/organizer/organizer_plat/searchui_launcher_api/group"/>
+ </component>
+ <component name="agenda_entry_ui_api" long-name="Agenda Entry UI API" filter="s60" class="api">
+ <unit bldFile="app/organizer/organizer_plat/agenda_entry_ui_api/group"/>
+ </component>
+ <component name="meeting_request_utillities_api" long-name="Meeting Request Utillities API" filter="s60" class="api">
+ <unit bldFile="app/organizer/organizer_plat/meeting_request_utillities_api/group"/>
+ </component>
+ <component name="meeting_request_viewer_api" long-name="Meeting Request Viewer API" filter="s60" class="api">
+ <unit bldFile="app/organizer/organizer_plat/meeting_request_viewer_api/group"/>
+ </component>
+ <component name="calendar_custamization_api" long-name="Calendar Customization API" filter="s60" class="api">
+ <unit bldFile="app/organizer/organizer_plat/calendar_custamization_api/group"/>
+ </component>
+ </collection>
+ <collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="app">
+ <component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" class="api">
+ <unit bldFile="app/organizer/organizer_pub/calendar_interim_utils2_api/group"/>
+ </component>
+ <component name="notepad_library_api" long-name="Notepad Library API" filter="s60" class="api">
+ <unit bldFile="app/organizer/organizer_pub/notepad_library_api/group"/>
+ </component>
+ </collection>
<collection name="alarmengines" long-name="Alarm Engines" level="engine">
<component name="missedalarmstore" filter="s60" long-name="Missed Alarm Store">
<unit bldFile="app/organizer/alarmengines/missedalarmstore/group"/>
@@ -6160,18 +9229,97 @@
</component>
</collection>
<collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
- <component name="organizer_pub" filter="s60" long-name="Organizer Application Suite Public Interfaces" class="api">
- <unit bldFile="app/organizer/organizer_pub/group"/>
- </component>
- <component name="organizer_plat" filter="s60" long-name="Organizer Application Suite Platform Interfaces" class="api">
- <unit bldFile="app/organizer/organizer_plat/group"/>
- </component>
<component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="^2" purpose="development" class="config PC">
<unit mrp="app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
</component>
</collection>
</block>
<block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="mail eng base ui">
+ <collection name="msg_pub" long-name="Messaging Apps Public APIs" level="ui">
+ <component name="messaging_integration_api" long-name="Messaging Integration API" filter="s60" class="api">
+ <unit bldFile="app/messaging/msg_pub/messaging_integration_api/group"/>
+ </component>
+ <component name="plugin_bio_control_api" long-name="Plug-in Bio Control API" filter="s60" class="api">
+ <unit bldFile="app/messaging/msg_pub/plugin_bio_control_api/group"/>
+ </component>
+ <component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api">
+ <unit bldFile="app/messaging/msg_pub/mms_client_mtm_api/group"/>
+ </component>
+ <component name="open_new_message_notification_api" long-name="Open New Message Notification API" filter="s60" class="api">
+ <unit bldFile="app/messaging/msg_pub/open_new_message_notification_api/group"/>
+ </component>
+ <component name="messaging_editor_constants_api" long-name="Messaging Editor Constants API" filter="s60" class="api">
+ <unit bldFile="app/messaging/msg_pub/messaging_editor_constants_api/group"/>
+ </component>
+ </collection>
+ <collection name="msg_plat" long-name="Messaging Apps Platform APIs" level="ui">
+ <component name="smil_player_launch_api" long-name="SMIL Player Launch API" filter="s60" class="api">
+ <unit bldFile="app/messaging/msg_plat/smil_player_launch_api/group"/>
+ </component>
+ <component name="messaging_media_resolver_api" long-name="Messaging Media Resolver API" filter="s60" class="api">
+ <unit bldFile="app/messaging/msg_plat/messaging_media_resolver_api/group"/>
+ </component>
+ <component name="smil_engine_api" long-name="SMIL Engine API" filter="s60" class="api">
+ <unit bldFile="app/messaging/msg_plat/smil_engine_api/group"/>
+ </component>
+ <component name="mms_server_settings_api" long-name="MMS Server Settings API" filter="s60" class="api">
+ <unit bldFile="app/messaging/msg_plat/mms_server_settings_api/group"/>
+ </component>
+ <component name="new_contacts_note_secondary_display_api" long-name="New Contacts Note Secondary Display API" filter="s60" class="api">
+ <unit bldFile="app/messaging/msg_plat/new_contacts_note_secondary_display_api/group"/>
+ </component>
+ <component name="messaging_center_ui_utilities_api" long-name="Messaging Center UI Utilities API" filter="s60" class="api">
+ <unit bldFile="app/messaging/msg_plat/messaging_center_ui_utilities_api/group"/>
+ </component>
+ <component name="internet_mail_mtm_ui_api" long-name="Internet Mail MTM UI API" filter="s60" class="api">
+ <unit bldFile="app/messaging/msg_plat/internet_mail_mtm_ui_api/group"/>
+ </component>
+ <component name="messaging_editor_api" long-name="Messaging Editor API" filter="s60" class="api">
+ <unit bldFile="app/messaging/msg_plat/messaging_editor_api/group"/>
+ </component>
+ <component name="email_domain_utilities_api" long-name="Email Domain Utilities API" filter="s60" class="api">
+ <unit bldFile="app/messaging/msg_plat/email_domain_utilities_api/group"/>
+ </component>
+ <component name="smil_transition_api" long-name="SMIL Transition API" filter="s60" class="api">
+ <unit bldFile="app/messaging/msg_plat/smil_transition_api/group"/>
+ </component>
+ <component name="new_contacts_note_status_api" long-name="New Contacts Note Status API" filter="s60" class="api">
+ <unit bldFile="app/messaging/msg_plat/new_contacts_note_status_api/group"/>
+ </component>
+ <component name="unified_editor_video_conversion_api" long-name="Unified Editor Video Conversion API" filter="s60" class="api">
+ <unit bldFile="app/messaging/msg_plat/unified_editor_video_conversion_api/group"/>
+ </component>
+ <component name="mms_conformance_api" long-name="MMS Conformance API" filter="s60" class="api">
+ <unit bldFile="app/messaging/msg_plat/mms_conformance_api/group"/>
+ </component>
+ <component name="new_contacts_note_variables_api" long-name="New Contacts Note Variables API" filter="s60" class="api">
+ <unit bldFile="app/messaging/msg_plat/new_contacts_note_variables_api/group"/>
+ </component>
+ <component name="new_message_notification_api" long-name="New Message Notification API" filter="s60" class="api">
+ <unit bldFile="app/messaging/msg_plat/new_message_notification_api/group"/>
+ </component>
+ <component name="mms_application_api" long-name="MMS Application API" filter="s60" class="api">
+ <unit bldFile="app/messaging/msg_plat/mms_application_api/group"/>
+ </component>
+ <component name="mms_engine_settings_api" long-name="MMS Engine Settings API" filter="s60" class="api">
+ <unit bldFile="app/messaging/msg_plat/mms_engine_settings_api/group"/>
+ </component>
+ <component name="mms_codec_client_api" long-name="MMS Codec Client API" filter="s60" class="api">
+ <unit bldFile="app/messaging/msg_plat/mms_codec_client_api/group"/>
+ </component>
+ <component name="send_ui_meeting_request_api" long-name="Send UI Meeting Request API" filter="s60" class="api">
+ <unit bldFile="app/messaging/msg_plat/send_ui_meeting_request_api/group"/>
+ </component>
+ <component name="new_contact_notes_extended_api" long-name="New Contact Notes Extended API" filter="s60" class="api">
+ <unit bldFile="app/messaging/msg_plat/new_contact_notes_extended_api/group"/>
+ </component>
+ <component name="mail_ui_constants_api" long-name="Mail UI Constants API" filter="s60" class="api">
+ <unit bldFile="app/messaging/msg_plat/mail_ui_constants_api/group"/>
+ </component>
+ <component name="sim_dialog_launch_api" long-name="SIM Dialog Launch API" filter="s60" class="api">
+ <unit bldFile="app/messaging/msg_plat/sim_dialog_launch_api/group"/>
+ </component>
+ </collection>
<collection name="mobilemessaging" long-name="Mobile Messaging" level="ui">
<component name="audiomsg" filter="s60" long-name="Audio Message">
<unit bldFile="app/messaging/mobilemessaging/audiomsg/group"/>
@@ -6315,18 +9463,28 @@
</component>
</collection>
<collection name="messaging_info" long-name="Messaging Apps Info" level="ui">
- <component name="msg_plat" long-name="Messaging Apps Platform APIs" filter="s60" class="api">
- <unit bldFile="app/messaging/msg_plat/group"/>
- </component>
- <component name="msg_pub" long-name="Messaging Apps Public APIs" filter="s60" class="api">
- <unit bldFile="app/messaging/msg_pub/group"/>
- </component>
<component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
<unit mrp="app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
</component>
</collection>
</block>
<block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
+ <collection name="email_pub" long-name="Email Apps Public Interfaces" level="app">
+ <component name="email_widget_api" long-name="Email Widget API" filter="s60" class="api">
+ <unit bldFile="app/commonemail/email_pub/email_widget_api/group"/>
+ </component>
+ </collection>
+ <collection name="email_plat" long-name="Email Apps Platform Interfaces" level="app">
+ <component name="email_client_api" long-name="Email Client API" filter="s60" class="api">
+ <unit bldFile="app/commonemail/email_plat/email_client_api/group"/>
+ </component>
+ <component name="email_setup_plugin_api" long-name="Email Setup Plugin API" filter="s60" class="api">
+ <unit bldFile="app/commonemail/email_plat/email_setup_plugin_api/group"/>
+ </component>
+ <component name="email_crkeys_api" long-name="Email CenRep Keys API" filter="s60" class="api">
+ <unit bldFile="app/commonemail/email_plat/email_crkeys_api/group"/>
+ </component>
+ </collection>
<collection name="emailservices" long-name="Email Services" level="service">
<component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2">
<unit bldFile="app/commonemail/emailservices/emailframework/group"/>
@@ -6462,15 +9620,20 @@
<!-- should this be commented out or not? -->
<!-- <unit bldFile="help/group"/> -->
</component>
- <component name="email_plat" filter="s60" long-name="Email Apps Platform Interfaces" class="api">
- <unit bldFile="app/commonemail/email_plat/group"/>
- </component>
- <component name="email_pub" filter="s60" long-name="Email Apps Public Interfaces" class="api">
- <unit bldFile="app/commonemail/email_pub/group"/>
- </component>
</collection>
</block>
<block name="conversations" level="apps" long-name="Conversation Apps" levels="settings utils plugin ui">
+ <collection name="conversations_plat" long-name="Conversation Apps Platform Interfaces" level="ui">
+ <component name="im_cv_launcher_api" long-name="IM CV Launcher API" filter="s60" class="api">
+ <unit bldFile="app/conversations/conversations_plat/im_cv_launcher_api/group"/>
+ </component>
+ <component name="im_connection_api" long-name="IM Connection API" filter="s60" class="api">
+ <unit bldFile="app/conversations/conversations_plat/im_connection_api/group"/>
+ </component>
+ <component name="im_cv_appui_api" long-name="IM CV App UI API" filter="s60" class="api">
+ <unit bldFile="app/conversations/conversations_plat/im_cv_appui_api/group"/>
+ </component>
+ </collection>
<collection name="uiservicetabsettings" long-name="UI Service Tab Settings" level="settings">
<!-- this is really at the wrong rank. should move down a directory -->
<component name="vimpstsettings" filter="s60" long-name="VIMP Service Tab Settings">
@@ -6552,9 +9715,6 @@
</component>
</collection>
<collection name="conversations_info" long-name="Conversation Apps Info" level="ui">
- <component name="conversations_plat" filter="s60" long-name="Conversation Apps Platform Interfaces" class="api">
- <unit bldFile="app/conversations/conversations_plat/group"/>
- </component>
<component name="conversations_build" filter="s60" long-name="Conversation Apps Build">
<!-- can the exports be moved to other components? or this remade into a configuration component?-->
<unit bldFile="app/conversations/group"/>
@@ -6562,32 +9722,40 @@
</collection>
</block>
<block name="im" level="apps" long-name="Instant Messaging Apps" levels="support prot engine apps">
+ <collection name="im_plat" long-name="Instant Messaging Apps Platform Interfaces" level="apps">
+ <component name="wv_sap_settings_api" long-name="WV SAP Settings API" filter="s60" class="api">
+ <unit bldFile="app/im/im_plat/wv_sap_settings_api/group"/>
+ </component>
+ </collection>
<collection name="wvsettings20" long-name="Wireless Village Settings Engine" level="support">
<!-- this is really a component. should move down a directory -->
<component name="wvsapsettingsstore" long-name="WV SAP Settings Store" filter="s60" introduced="9.3">
<unit bldFile="app/im/wvsettings20/group"/>
</component>
</collection>
- <collection name="im_info" long-name="Instant Messaging Apps Info" level="apps">
- <component name="im_plat" filter="s60" long-name="Instant Messaging Apps Platform Interfaces" class="api">
- <unit bldFile="app/im/im_plat/group"/>
- </component>
- </collection>
</block>
<block name="dictionary" level="services" long-name="Dictionary" levels="utils ui">
+ <collection name="dictionary_plat" long-name="Dictionary Platform Interfaces" level="ui">
+ <component name="menu_suites_macros_api" long-name="Menu Suites Macros API" filter="s60" class="api">
+ <unit bldFile="app/dictionary/dictionary_plat/menu_suites_macros_api/group"/>
+ </component>
+ </collection>
<collection name="userdict" long-name="User Dictionary" level="ui">
<!-- collection is really a component, move down a dir -->
<component name="userdict_build" filter="s60" long-name="Japanese User Dictionary">
<unit bldFile="app/dictionary/userdict/group"/>
</component>
</collection>
- <collection name="dictionary_info" long-name="Dictionary Info" level="ui">
- <component name="dictionary_plat" filter="s60" long-name="Dictionary Platform Interfaces" class="api">
- <unit bldFile="app/dictionary/dictionary_plat/group"/>
- </component>
- </collection>
</block>
<block name="camera" level="apps" long-name="Camera Apps">
+ <collection name="camera_plat" long-name="Camera Apps Platform Interfaces">
+ <component name="camcorder_ui_constants_api" long-name="Camcorder UI Constants API" filter="s60" class="api">
+ <unit bldFile="app/camera/camera_plat/camcorder_ui_constants_api/group"/>
+ </component>
+ <component name="active_palette_2_api" long-name="Active Palette 2 API" filter="s60" class="api">
+ <unit bldFile="app/camera/camera_plat/active_palette_2_api/group"/>
+ </component>
+ </collection>
<collection name="camerauis" long-name="Camera UIs">
<component name="activepalette" filter="s60" long-name="Active Palette">
<unit bldFile="app/camera/camerauis/activepalette/group"/>
@@ -6597,13 +9765,26 @@
<unit bldFile="app/camera/camerauis/cameraapp/help/group"/>
</component>
</collection>
- <collection name="camera_info" long-name="Camera Apps Info">
- <component name="camera_plat" filter="s60" long-name="Camera Apps Platform Interfaces" class="api">
- <unit bldFile="app/camera/camera_plat/group"/>
- </component>
- </collection>
+ <collection name="camera_info" long-name="Camera Apps Info"/>
</block>
<block name="imgeditor" level="apps" long-name="Image Editor Apps" levels="engine ui">
+ <collection name="imgeditor_plat" long-name="Image Editor Apps Platform Interfaces" level="ui">
+ <component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="s60" class="api">
+ <unit bldFile="app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
+ </component>
+ <component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="s60" class="api">
+ <unit bldFile="app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
+ </component>
+ <component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="s60" class="api">
+ <unit bldFile="app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
+ </component>
+ <component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="s60" class="api">
+ <unit bldFile="app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
+ </component>
+ <component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="s60" class="api">
+ <unit bldFile="app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
+ </component>
+ </collection>
<collection name="imageeditor" long-name="Image Editor UI" level="ui">
<component name="pb" filter="s60" long-name="Plugin Base">
<unit bldFile="app/imgeditor/imageeditor/pb/group"/>
@@ -6692,13 +9873,13 @@
<unit bldFile="app/imgeditor/imageeditorengine/group"/>
</component>
</collection>
- <collection name="imgeditor_info" long-name="Image Editor Apps Info" level="ui">
- <component name="imgeditor_plat" filter="s60" long-name="Image Editor Apps Platform Interfaces" class="api">
- <unit bldFile="app/imgeditor/imgeditor_plat/group"/>
- </component>
- </collection>
</block>
<block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
+ <collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
+ <component name="video_editor_engine_api" long-name="Video Editor Engine API" introduced="^2" class="api">
+ <unit bldFile="app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
+ </component>
+ </collection>
<collection name="videditor" long-name="Video Editor" level="ui">
<component name="videoeditorcommon" filter="s60" long-name="Video Editor Common" introduced="^2">
<unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
@@ -6751,13 +9932,19 @@
<unit bldFile="app/videoeditor/videoeditorengine/group"/>
</component>
</collection>
- <collection name="videoeditor_info" long-name="Video Editor Apps Info" level="ui">
- <component name="videoeditor_plat" filter="s60" long-name="Video Editor Apps Platform Interfaces" introduced="^2" class="api">
- <unit bldFile="app/videoeditor/videoeditor_plat/group"/>
- </component>
- </collection>
</block>
<block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
+ <collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
+ <component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
+ <unit bldFile="app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
+ </component>
+ <component name="video_player_file_details_dialog_api" long-name="Media Player File Details Dialog API" filter="s60" class="api">
+ <unit bldFile="app/videoplayer/videoplayer_plat/video_player_file_details_dialog_api/group" filter="!test"/>
+ </component>
+ <component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
+ <unit bldFile="app/videoplayer/videoplayer_plat/videocollection_api/group"/>
+ </component>
+ </collection>
<collection name="videofeeds" long-name="Video Feeds" level="util">
<component name="iptv_utils" filter="s60" long-name="IPTV Util" introduced="^3">
<unit bldFile="app/videoplayer/videofeeds/utils/group"/>
@@ -6866,7 +10053,7 @@
<unit bldFile="app/videoplayer/videoplayerapp/lwplayer/group"/>
</component>
<component name="mpxvideoplayer" filter="s60" long-name="MPX Video Player" plugin="Y">
- <unit bldFile="app/videoplayer/videoplayerapp/mpxvideoplayer/group"/>
+ <unit bldFile="app/videoplayer/videoplayerapp/mpxvideoplayer/group" filter="!test"/>
</component>
<component name="videoplayerlauncher" filter="s60" long-name="Video Player Launcher">
<unit bldFile="app/videoplayer/videoplayerapp/videoplayerlauncher/group"/>
@@ -6874,28 +10061,40 @@
</collection>
<collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
<component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
- <unit bldFile="app/videoplayer/videoplayback/videohelix/group"/>
+ <unit bldFile="app/videoplayer/videoplayback/videohelix/group" filter="!test"/>
</component>
<component name="videopdlplaybackviewplugin" filter="s60" long-name="Video PDL Playback View Plugin" introduced="^3" plugin="Y">
- <unit bldFile="app/videoplayer/videoplayback/videopdlplaybackviewplugin/group"/>
+ <unit bldFile="app/videoplayer/videoplayback/videopdlplaybackviewplugin/group" filter="!test"/>
</component>
<component name="videoplaybackcontrols" filter="s60" long-name="Video Playback Controls" introduced="^3" plugin="Y">
- <unit bldFile="app/videoplayer/videoplayback/videoplaybackcontrols/group"/>
+ <unit bldFile="app/videoplayer/videoplayback/videoplaybackcontrols/group" filter="!test"/>
</component>
<component name="videoplaybackviewplugin" filter="s60" long-name="Video Playback View Plugin" introduced="^3" plugin="Y">
<unit bldFile="app/videoplayer/videoplayback/videoplaybackviewplugin/group"/>
</component>
<component name="videoplaybackviews" filter="s60" long-name="Video Playback Views" introduced="^3" plugin="Y">
- <unit bldFile="app/videoplayer/videoplayback/videoplaybackviews/group"/>
- </component>
- </collection>
- <collection name="videoplayer_info" long-name="Video Player Apps Info" level="apps">
- <component name="videoplayer_plat" filter="s60" long-name="Video Player Apps Platform Interfaces" class="api">
- <unit bldFile="app/videoplayer/videoplayer_plat/group"/>
+ <unit bldFile="app/videoplayer/videoplayback/videoplaybackviews/group" filter="!test"/>
</component>
</collection>
</block>
<block name="photos" level="apps" long-name="Photos" levels="support fw ui app">
+ <collection name="photos_plat" long-name="Photos Platform Interfaces" level="app">
+ <component name="collection_plugins_api" long-name="Collection Plugins API" introduced="^2" filter="s60" class="api">
+ <unit bldFile="app/photos/photos_plat/collection_plugins_api/group"/>
+ </component>
+ <component name="controllers_collection_api" long-name="Controllers Collection API" introduced="^2" filter="s60" class="api">
+ <unit bldFile="app/photos/photos_plat/controllers_collection_api/group"/>
+ </component>
+ <component name="gallery_utilities_api" long-name="Gallery Utilities API" introduced="^2" filter="s60" class="api">
+ <unit bldFile="app/photos/photos_plat/gallery_utilities_api/group"/>
+ </component>
+ <component name="slideshow_ui_constants_api" long-name="Slideshow Ui Constants API" introduced="^2" filter="s60" class="api">
+ <unit bldFile="app/photos/photos_plat/slideshow_ui_constants_api/group"/>
+ </component>
+ <component name="views_metadatadialog_api" long-name="Views Metadata Dialog API" introduced="^2" filter="s60" class="api">
+ <unit bldFile="app/photos/photos_plat/views_metadatadialog_api/group"/>
+ </component>
+ </collection>
<collection name="photosgallery" long-name="Photos Gallery" level="app">
<!-- consider splitting this collection into the application itself, and the frameworks behind it -->
<component name="photosgallery_help" filter="s60" long-name="Photos Help" introduced="^2">
@@ -6949,13 +10148,37 @@
<unit bldFile="app/photos/photosgallery/group"/>
</component>
</collection>
- <collection name="photos_info" long-name="Photos Info" level="app">
- <component name="photos_plat" filter="s60" long-name="Photos Platform Interfaces" introduced="^2" class="api">
- <unit bldFile="app/photos/photos_plat/group"/>
- </component>
- </collection>
</block>
<block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
+ <collection name="musicplayer_plat" long-name="Music Player Apps Platform Interfaces" level="app">
+ <component name="mpx_music_player_app_api" long-name="MPX Music Player App API" filter="s60" class="api">
+ <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_app_api/group"/>
+ </component>
+ <component name="mpx_music_player_commonui_api" long-name="MPX Music Player Common UI API" filter="s60" class="api">
+ <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_commonui_api/group"/>
+ </component>
+ <component name="mpx_music_player_media_key_handler_api" long-name="MPX Music Player Media Key Handler API" filter="s60" class="api">
+ <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_media_key_handler_api/group"/>
+ </component>
+ <component name="mpx_music_player_remote_control_api" long-name="MPX Music Player Remote Control API" filter="s60" class="api">
+ <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_remote_control_api/group"/>
+ </component>
+ <component name="mpx_music_shop_ui_api" long-name="MPX Music Shop UI API" filter="s60" class="api">
+ <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_shop_ui_api/group"/>
+ </component>
+ <component name="mpx_music_wap_adapter_cenrep_api" long-name="MPX Music Wap Adapter CenRep API" filter="s60" class="api">
+ <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_wap_adapter_cenrep_api/group"/>
+ </component>
+ <component name="mpx_music_store_api" long-name="MPX Music Store Find API" filter="s60" class="api">
+ <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_store_api/group"/>
+ </component>
+ <component name="audio_application_features_api" long-name="Audio Application Features API" filter="s60" class="api">
+ <unit bldFile="app/musicplayer/musicplayer_plat/audio_application_features_api/group"/>
+ </component>
+ <component name="music_content_publisher_plugin_api" long-name="Music Content Publisher Plugin API" filter="s60" class="api">
+ <unit bldFile="app/musicplayer/musicplayer_plat/music_content_publisher_plugin_api/group"/>
+ </component>
+ </collection>
<collection name="mpxmusicplayer" long-name="MPX Music Player" level="app">
<component name="mpxmusicplayer_help" filter="s60" long-name="Help">
<unit bldFile="app/musicplayer/mpxmusicplayer/help/group"/>
@@ -7016,9 +10239,6 @@
<!-- should explicitly #inlcude musicplayerbldvariant.hrh in each component -->
<unit bldFile="app/musicplayer/group"/>
</component>
- <component name="musicplayer_plat" filter="s60" long-name="Music Player Apps Platform Interfaces" class="api">
- <unit bldFile="app/musicplayer/musicplayer_plat/group"/>
- </component>
</collection>
</block>
<block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
@@ -7051,17 +10271,21 @@
<block name="tv" level="services" long-name="TV Apps"/>
<block name="voicerec" level="apps" long-name="Voice Recorder Apps">
<!-- custom filter pref_test-->
+ <collection name="voicerec_plat" long-name="Voice Recorder Apps Platform Interfaces">
+ <component name="new_file_service_api" long-name="New File Service API" filter="s60" class="api">
+ <unit bldFile="app/voicerec/voicerec_plat/new_file_service_api/group"/>
+ </component>
+ <component name="voicerecorder_public_constants_api" long-name="Voice Recorder Public Constants API" filter="s60" class="api">
+ <unit bldFile="app/voicerec/voicerec_plat/voicerecorder_public_constants_api/group"/>
+ </component>
+ </collection>
<collection name="voicerecorder" long-name="Voice Recorder">
<!--this is really a component, move down a directory -->
<component name="voicerecorder_build" filter="s60" long-name="Voice Recorder Build">
<unit bldFile="app/voicerec/voicerecorder/group"/>
</component>
</collection>
- <collection name="voicerec_info" long-name="Voice Recorder Apps Info">
- <component name="voicerec_plat" filter="s60" long-name="Voice Recorder Apps Platform Interfaces" class="api">
- <unit bldFile="app/voicerec/voicerec_plat/group"/>
- </component>
- </collection>
+ <collection name="voicerec_info" long-name="Voice Recorder Apps Info"/>
</block>
<block name="screensaver" level="apps" long-name="Screen Saver Apps" levels="plugin ui">
<!-- is this a user-facing application or a daemon? -->
@@ -7087,6 +10311,17 @@
</collection>
</block>
<block name="homescreen" level="apps" long-name="Home Screen Apps" levels="fw support apps">
+ <collection name="homescreen_plat" long-name="Home Screen Apps Platform Interfaces" level="apps">
+ <component name="menu_settings_api" long-name="Menu Settings API" filter="s60" class="api">
+ <unit bldFile="app/homescreen/homescreen_plat/menu_settings_api/group"/>
+ </component>
+ <component name="hs_content_control_ui" long-name="HS Content Control Ui" filter="s60" class="api">
+ <unit bldFile="app/homescreen/homescreen_plat/hs_content_control_ui/group"/>
+ </component>
+ <component name="hs_renderingplugin_api" long-name="HS Rendering Plugin API" filter="s60" class="api">
+ <unit bldFile="app/homescreen/homescreen_plat/hs_renderingplugin_api/group"/>
+ </component>
+ </collection>
<collection name="idlehomescreen" long-name="Idle Home Screen" level="apps">
<component name="nativeuicontroller" filter="s60" long-name="Native UI Controller">
<unit bldFile="app/homescreen/idlehomescreen/nativeuicontroller/group"/>
@@ -7146,16 +10381,17 @@
<unit bldFile="app/homescreen/taskswitcher/taskswitcherui/group"/>
</component>
</collection>
- <collection name="homescreen_info" long-name="Home Screen Apps Info" level="apps">
- <component name="homescreen_plat" filter="s60" long-name="Home Screen Apps Platform Interfaces" class="api">
- <unit bldFile="app/homescreen/homescreen_plat/group"/>
- </component>
- </collection>
</block>
<block name="graphicsuis" level="services" long-name="Graphics UIs" levels="util ui">
- <collection name="graphicsuis_info" long-name="Graphics UIs Info" level="ui">
- <component name="graphicsuis_plat" filter="s60" long-name="Graphics UIs Platform Interfaces" class="api">
- <unit bldFile="app/graphicsuis/graphicsuis_plat/group"/>
+ <collection name="graphicsuis_plat" long-name="Graphics UIs Platform Interfaces" level="ui">
+ <component name="svgt_viewer_ui_api" long-name="SVG-T Viewer UI API" filter="s60" class="api">
+ <unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_viewer_ui_api/group"/>
+ </component>
+ <component name="svg_application_observer_utility_api" long-name="SVG Application Observer Utility API" filter="s60" class="api">
+ <unit bldFile="app/graphicsuis/graphicsuis_plat/svg_application_observer_utility_api/group"/>
+ </component>
+ <component name="svgt_file_view_details_dialog_api" long-name="SVG-T File View Details Dialog API" filter="s60" class="api">
+ <unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_file_view_details_dialog_api/group"/>
</component>
</collection>
<collection name="svgtviewer" long-name="SVG-T Viewer" level="ui">
@@ -7165,21 +10401,106 @@
</collection>
</block>
<block name="profile" level="apps" long-name="Profiles" levels="app">
+ <collection name="profile_plat" long-name="Profiles Platform Interfaces" level="app">
+ <component name="profiles_settings_view_api" long-name="Profiles Settings View API" filter="s60" class="api">
+ <unit bldFile="app/profile/profile_plat/profiles_settings_view_api/group"/>
+ </component>
+ </collection>
<collection name="profilesapplication" long-name="Profiles Application" level="app">
<component name="profiles" filter="s60" long-name="Profiles">
<unit bldFile="app/profile/profilesapplication/profiles/group"/>
</component>
</collection>
<collection name="profile_info" long-name="Profiles Info" level="app">
- <component name="profile_plat" filter="s60" long-name="Profiles Platform Interfaces" class="api">
- <unit bldFile="app/profile/profile_plat/group"/>
- </component>
<component name="profile_help" filter="s60" long-name="Profiles Help">
<unit bldFile="app/profile/help/group"/>
</component>
</collection>
</block>
<block name="speechsrv" level="services" long-name="Speech Recognition UIs" levels="engine framework ui">
+ <collection name="speechsrv_plat" long-name="Speech Recognition UIs Platform Interfaces" level="ui">
+ <component name="vas_api" long-name="VAS API" filter="s60" class="api">
+ <unit bldFile="app/speechsrv/speechsrv_plat/vas_api/group"/>
+ </component>
+ <component name="nss_devasr_api" long-name="NSS DevASR API" filter="s60" class="api">
+ <unit bldFile="app/speechsrv/speechsrv_plat/nss_devasr_api/group"/>
+ </component>
+ <component name="tts_hw_device_api" long-name="TTS HW Device API" filter="s60" class="api">
+ <unit bldFile="app/speechsrv/speechsrv_plat/tts_hw_device_api/group"/>
+ </component>
+ <component name="voice_commands_resource_header_api" long-name="Voice Commands Resource Header API" filter="s60" class="api">
+ <unit bldFile="app/speechsrv/speechsrv_plat/voice_commands_resource_header_api/group"/>
+ </component>
+ <component name="nss_mmf_tts_custom_commands_api" long-name="NSS MMF TTS Custom Commands API" filter="s60" class="api">
+ <unit bldFile="app/speechsrv/speechsrv_plat/nss_mmf_tts_custom_commands_api/group"/>
+ </component>
+ <component name="srsf_cenrep_settings_api" long-name="SRSF CenRep Settings API" filter="s60" class="api">
+ <unit bldFile="app/speechsrv/speechsrv_plat/srsf_cenrep_settings_api/group"/>
+ </component>
+ <component name="voice_ui_plugin_api" long-name="Voice UI Plug-in API" filter="s60" class="api">
+ <unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_plugin_api/group"/>
+ </component>
+ <component name="nss_tts_utility_api" long-name="NSS TTS Utility API" filter="s60" class="api">
+ <unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_utility_api/group"/>
+ </component>
+ <component name="nss_srs_custom_commands_api" long-name="NSS SRS Custom Commands API" filter="s60" class="api">
+ <unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_custom_commands_api/group"/>
+ </component>
+ <component name="srsf_secondarydisplay_api" long-name="SRSF Secondary Display API" filter="s60" class="api">
+ <unit bldFile="app/speechsrv/speechsrv_plat/srsf_secondarydisplay_api/group"/>
+ </component>
+ <component name="asrs_hw_device_api" long-name="ASRS Hardware Device API" filter="s60" class="api">
+ <unit bldFile="app/speechsrv/speechsrv_plat/asrs_hw_device_api/group"/>
+ </component>
+ <component name="vas_vcommand_api" long-name="VAS Voice Command API" filter="s60" class="api">
+ <unit bldFile="app/speechsrv/speechsrv_plat/vas_vcommand_api/group"/>
+ </component>
+ <component name="adaptation_hw_device_api" long-name="Adaptation Hardware Device API" filter="s60" class="api">
+ <unit bldFile="app/speechsrv/speechsrv_plat/adaptation_hw_device_api/group"/>
+ </component>
+ <component name="nss_devtts_api" long-name="NSS DevTTS API" filter="s60" class="api">
+ <unit bldFile="app/speechsrv/speechsrv_plat/nss_devtts_api/group"/>
+ </component>
+ <component name="nss_srs_utility_api" long-name="NSS SRS Utility API" filter="s60" class="api">
+ <unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_utility_api/group"/>
+ </component>
+ <component name="recognition_hw_device_api" long-name="Recognition Hardware Device API" filter="s60" class="api">
+ <unit bldFile="app/speechsrv/speechsrv_plat/recognition_hw_device_api/group"/>
+ </component>
+ <component name="vas_contact_handler_api" long-name="VAS Contact Handler API" filter="s60" class="api">
+ <unit bldFile="app/speechsrv/speechsrv_plat/vas_contact_handler_api/group"/>
+ </component>
+ <component name="nlp_hw_device" long-name="NLP Hardware Device" filter="s60" class="api">
+ <unit bldFile="app/speechsrv/speechsrv_plat/nlp_hw_device/group"/>
+ </component>
+ <component name="nss_si_speech_recognition_data_api" long-name="NSS SI Speech Recognition Data API" filter="s60" class="api">
+ <unit bldFile="app/speechsrv/speechsrv_plat/nss_si_speech_recognition_data_api/group"/>
+ </component>
+ <component name="nss_tts_common_api" long-name="NSS TTS Common API" filter="s60" class="api">
+ <unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_common_api/group"/>
+ </component>
+ <component name="grcompiler_hw_device_api" long-name="Grammar Compiler Hardware Device API" filter="s60" class="api">
+ <unit bldFile="app/speechsrv/speechsrv_plat/grcompiler_hw_device_api/group"/>
+ </component>
+ <component name="ttp_hw_device_api" long-name="TTP Hardware Device API" filter="s60" class="api">
+ <unit bldFile="app/speechsrv/speechsrv_plat/ttp_hw_device_api/group"/>
+ </component>
+ <component name="vocman_hw_device_api" long-name="VocMan Hardware Device API" filter="s60" class="api">
+ <unit bldFile="app/speechsrv/speechsrv_plat/vocman_hw_device_api/group"/>
+ </component>
+ <component name="speech_synthesis_clientserver_api" long-name="Speech Synthesis Client-Server API" filter="s60" class="api">
+ <unit bldFile="app/speechsrv/speechsrv_plat/speech_synthesis_clientserver_api/group"/>
+ </component>
+ <component name="voice_ui_accessory_button_handling_api" long-name="Voice UI Accessory Button Handling API" filter="s60" class="api">
+ <unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_accessory_button_handling_api/group"/>
+ </component>
+ <component name="ui_voice_recognition_api" long-name="UI Voice Recognition API" filter="s60" class="api">
+ <unit bldFile="app/speechsrv/speechsrv_plat/ui_voice_recognition_api/group"/>
+ </component>
+ <component name="vcommand_settings_cenrep_api" long-name="Voice Command Settings CenRep API" filter="s60" class="api">
+ <unit bldFile="app/speechsrv/speechsrv_plat/vcommand_settings_cenrep_api/group"/>
+ </component>
+ </collection>
<collection name="voiceui" long-name="Voice UI" level="ui">
<component name="vcommand" filter="s60" long-name="Voice Commands UI" introduced="^1">
<unit bldFile="app/speechsrv/voiceui/vcommand/group"/>
@@ -7270,11 +10591,7 @@
<unit bldFile="app/speechsrv/srsf/group"/>
</component>
</collection>
- <collection name="speechsrv_info" long-name="Speech Recognition UIs Info" level="ui">
- <component name="speechsrv_plat" filter="s60" long-name="Speech Recognition UIs Platform Interfaces" class="api">
- <unit bldFile="app/speechsrv/speechsrv_plat/group"/>
- </component>
- </collection>
+ <collection name="speechsrv_info" long-name="Speech Recognition UIs Info" level="ui"/>
</block>
<block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
<collection name="dtdinstaller" long-name="DTD Installer" level="install">
@@ -7343,6 +10660,17 @@
</collection>
</block>
<block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
+ <collection name="jrt_plat" long-name="JRT Platform Interfaces" level="ui">
+ <component name="java_registry_api" long-name="Java Registry API" filter="s60" class="api">
+ <unit bldFile="app/jrt/jrt_plat/java_registry_api/build"/>
+ </component>
+ <component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" class="api">
+ <unit bldFile="app/jrt/jrt_plat/java_env_info_api/build"/>
+ </component>
+ <component name="java_debug_api" long-name="Java Debug API" filter="s60" class="api">
+ <unit bldFile="app/jrt/jrt_plat/java_debug_api/build"/>
+ </component>
+ </collection>
<collection name="java_stubs" long-name="Java Stubs" level="util">
<!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
<component name="javadrmutils" long-name="Java DRM Utils" filter="s60,sf_build" class="placeholder">
@@ -7360,12 +10688,9 @@
</component>
</collection>
<collection name="jrt_info" long-name="JRT Info" level="rt">
- <component name="jrt_plat" filter="s60" long-name="JRT Platform Interfaces" class="api">
- <unit bldFile="app/jrt/jrt_plat/group"/>
- </component>
<component name="jrt_build" filter="s60" long-name="JRT Build">
<!-- needed for __JAVA_STUBS condition -->
- <unit bldFile="app/jrt/java_stubs/group"/>
+ <unit bldFile="app/jrt/group"/>
</component>
</collection>
</block>