1 files changed, 62 insertions, 60 deletions

diff --git a/parameter/Android.mk b/parameter/Android.mk
index aaa40ea..8592c52 100644
--- a/parameter/Android.mk
+++ b/parameter/Android.mk
@@ -34,86 +34,88 @@ LOCAL_PATH := $(call my-dir)
 common_copy_headers_to := parameter
 
 common_copy_headers := \
+        include/ParameterMgrLoggerForward.h \
         include/ParameterMgrPlatformConnector.h \
+        include/ParameterMgrFullConnector.h \
         include/SelectionCriterionTypeInterface.h \
         include/SelectionCriterionInterface.h \
         include/ParameterHandle.h
 
 common_src_files := \
-        Subsystem.cpp \
-        PathNavigator.cpp \
-        Element.cpp \
-        SystemClass.cpp \
-        ParameterMgr.cpp \
-        SelectionCriteria.cpp \
-        SelectionCriterionLibrary.cpp \
-        SelectionCriteriaDefinition.cpp \
-        SelectionCriterionType.cpp \
-        ElementLibrary.cpp \
-        SubsystemElementBuilder.cpp \
-        SelectionCriterion.cpp \
+        AreaConfiguration.cpp \
+        ArrayParameter.cpp \
+        AutoLog.cpp \
+        BaseParameter.cpp \
+        BinarySerializableElement.cpp \
+        BinaryStream.cpp \
+        BitParameterBlock.cpp \
+        BitParameterBlockType.cpp \
+        BitParameter.cpp \
+        BitParameterType.cpp \
+        BitwiseAreaConfiguration.cpp \
+        BooleanParameterType.cpp \
+        ComponentInstance.cpp \
         ComponentLibrary.cpp \
+        ComponentType.cpp \
+        CompoundRule.cpp \
+        ConfigurableDomain.cpp \
+        ConfigurableDomains.cpp \
+        ConfigurableElementAggregator.cpp \
         ConfigurableElement.cpp \
+        ConfigurationAccessContext.cpp \
+        DomainConfiguration.cpp \
+        Element.cpp \
+        ElementLibrary.cpp \
+        ElementLibrarySet.cpp \
+        ElementLocator.cpp \
+        EnumParameterType.cpp \
+        EnumValuePair.cpp \
+        ErrorContext.cpp \
+        FixedPointParameterType.cpp \
+        FormattedSubsystemObject.cpp \
+        FrameworkConfigurationLocation.cpp \
+        HardwareBackSynchronizer.cpp \
+        InstanceConfigurableElement.cpp \
+        InstanceDefinition.cpp \
+        IntegerParameterType.cpp \
+        LinearParameterAdaptation.cpp \
+        MappingContext.cpp \
         MappingData.cpp \
+        ParameterAccessContext.cpp \
+        ParameterAdaptation.cpp \
         ParameterBlackboard.cpp \
-        ComponentType.cpp \
-        TypeElement.cpp \
-        InstanceConfigurableElement.cpp \
-        ComponentInstance.cpp \
         ParameterBlockType.cpp \
-        ParameterType.cpp \
         Parameter.cpp \
-        BooleanParameterType.cpp \
-        IntegerParameterType.cpp \
-        ArrayParameter.cpp \
-        InstanceDefinition.cpp \
-        ParameterMgrPlatformConnector.cpp \
-        FixedPointParameterType.cpp \
-        ParameterAccessContext.cpp \
-        XmlFileIncluderElement.cpp \
         ParameterFrameworkConfiguration.cpp \
-        FrameworkConfigurationLocation.cpp \
+        ParameterHandle.cpp \
+        ParameterMgr.cpp \
+        ParameterMgrFullConnector.cpp \
+        ParameterMgrPlatformConnector.cpp \
+        ParameterType.cpp \
+        PathNavigator.cpp \
         PluginLocation.cpp \
-        ElementLibrarySet.cpp \
-        ErrorContext.cpp \
-        AreaConfiguration.cpp \
-        DomainConfiguration.cpp \
-        ConfigurableDomain.cpp \
-        SyncerSet.cpp \
-        ConfigurableDomains.cpp \
-        BinaryStream.cpp \
-        ConfigurationAccessContext.cpp \
-        XmlElementSerializingContext.cpp \
-        XmlParameterSerializingContext.cpp \
-        BinarySerializableElement.cpp \
-        BitwiseAreaConfiguration.cpp \
-        BitParameterBlockType.cpp \
-        BitParameterBlock.cpp \
-        BitParameterType.cpp \
-        BitParameter.cpp \
-        ElementLocator.cpp \
-        ParameterMgrLogger.cpp \
-        AutoLog.cpp \
-        CompoundRule.cpp \
+        RuleParser.cpp \
+        SelectionCriteria.cpp \
+        SelectionCriteriaDefinition.cpp \
+        SelectionCriterion.cpp \
+        SelectionCriterionLibrary.cpp \
         SelectionCriterionRule.cpp \
-        ConfigurableElementAggregator.cpp \
-        HardwareBackSynchronizer.cpp \
+        SelectionCriterionType.cpp \
         SimulatedBackSynchronizer.cpp \
-        MappingContext.cpp \
+        StringParameter.cpp \
+        StringParameterType.cpp \
+        Subsystem.cpp \
+        SubsystemElementBuilder.cpp \
         SubsystemObject.cpp \
-        FormattedSubsystemObject.cpp \
         SubsystemObjectCreator.cpp \
-        BaseParameter.cpp \
-        StringParameterType.cpp \
-        StringParameter.cpp \
-        EnumParameterType.cpp \
+        SyncerSet.cpp \
+        SystemClass.cpp \
+        TypeElement.cpp \
         VirtualSubsystem.cpp \
         VirtualSyncer.cpp \
-        ParameterHandle.cpp \
-        ParameterAdaptation.cpp \
-        LinearParameterAdaptation.cpp \
-        RuleParser.cpp \
-        EnumValuePair.cpp
+        XmlElementSerializingContext.cpp \
+        XmlFileIncluderElement.cpp \
+        XmlParameterSerializingContext.cpp
 
 common_module := libparameter
 common_module_tags := optional