summaryrefslogtreecommitdiffstats
path: root/parameter
diff options
context:
space:
mode:
authorDavid Wagner <david.wagner@intel.com>2015-01-06 18:30:49 +0100
committerDavid Wagner <david.wagner@intel.com>2015-01-22 12:02:31 +0100
commita53f6504e8d3d01ffd0ea1e655e202b03b943fe6 (patch)
tree31ccd90b534be0b481eeac5fa540daaac7f76bfd /parameter
parentd700782e7dae31cbef37ae038b992d2cb0c6f6a4 (diff)
downloadexternal_parameter-framework-a53f6504e8d3d01ffd0ea1e655e202b03b943fe6.zip
external_parameter-framework-a53f6504e8d3d01ffd0ea1e655e202b03b943fe6.tar.gz
external_parameter-framework-a53f6504e8d3d01ffd0ea1e655e202b03b943fe6.tar.bz2
parameter: sort C++ filenames and remove duplicates
There were duplicates in the CMakeLists.txt; this patch removes them and sorts the filenames so that they are identical in Android.mk and CMakeLists.txt. Please keep the names sorted, using the shell's "sort -u" command. Change-Id: I027676beb4ee19de2341cd65e0e5c077cddb5627 Signed-off-by: David Wagner <david.wagner@intel.com>
Diffstat (limited to 'parameter')
-rw-r--r--parameter/Android.mk118
-rw-r--r--parameter/CMakeLists.txt179
2 files changed, 112 insertions, 185 deletions
diff --git a/parameter/Android.mk b/parameter/Android.mk
index 247c745..0625c2b 100644
--- a/parameter/Android.mk
+++ b/parameter/Android.mk
@@ -41,79 +41,79 @@ common_copy_headers := \
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 \
+ 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 \
- 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
diff --git a/parameter/CMakeLists.txt b/parameter/CMakeLists.txt
index 590c7b1..cf2449e 100644
--- a/parameter/CMakeLists.txt
+++ b/parameter/CMakeLists.txt
@@ -27,152 +27,79 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
add_library(parameter SHARED
- Subsystem.cpp
- PathNavigator.cpp
- Element.cpp
- SystemClass.cpp
- ParameterMgr.cpp
- SelectionCriteria.cpp
- SelectionCriterionLibrary.cpp
- SelectionCriteriaDefinition.cpp
- SelectionCriterionType.cpp
- ElementLibrary.cpp
- SubsystemElementBuilder.cpp
- SelectionCriterion.cpp
- ComponentLibrary.cpp
- ConfigurableElement.cpp
- MappingData.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
- PluginLocation.cpp
- ElementLibrarySet.cpp
- ErrorContext.cpp
AreaConfiguration.cpp
- DomainConfiguration.cpp
- ConfigurableDomain.cpp
- SyncerSet.cpp
- ConfigurableDomains.cpp
- BinaryStream.cpp
- ConfigurationAccessContext.cpp
- XmlElementSerializingContext.cpp
- XmlParameterSerializingContext.cpp
+ ArrayParameter.cpp
+ AutoLog.cpp
+ BaseParameter.cpp
BinarySerializableElement.cpp
- BitwiseAreaConfiguration.cpp
- BitParameterBlockType.cpp
+ BinaryStream.cpp
BitParameterBlock.cpp
- BitParameterType.cpp
+ BitParameterBlockType.cpp
BitParameter.cpp
- ElementLocator.cpp
- AutoLog.cpp
+ BitParameterType.cpp
+ BitwiseAreaConfiguration.cpp
+ BooleanParameterType.cpp
+ ComponentInstance.cpp
+ ComponentLibrary.cpp
+ ComponentType.cpp
CompoundRule.cpp
- SelectionCriterionRule.cpp
+ ConfigurableDomain.cpp
+ ConfigurableDomains.cpp
ConfigurableElementAggregator.cpp
- HardwareBackSynchronizer.cpp
- SimulatedBackSynchronizer.cpp
- MappingContext.cpp
- SubsystemObject.cpp
- FormattedSubsystemObject.cpp
- SubsystemObjectCreator.cpp
- BaseParameter.cpp
- StringParameterType.cpp
- StringParameter.cpp
- EnumParameterType.cpp
- VirtualSubsystem.cpp
- VirtualSyncer.cpp
- ParameterHandle.cpp
- ParameterAdaptation.cpp
- LinearParameterAdaptation.cpp
- RuleParser.cpp
- EnumValuePair.cpp
- Subsystem.cpp
- PathNavigator.cpp
+ ConfigurableElement.cpp
+ ConfigurationAccessContext.cpp
+ DomainConfiguration.cpp
Element.cpp
- SystemClass.cpp
- ParameterMgr.cpp
- SelectionCriteria.cpp
- SelectionCriterionLibrary.cpp
- SelectionCriteriaDefinition.cpp
- SelectionCriterionType.cpp
ElementLibrary.cpp
- SubsystemElementBuilder.cpp
- SelectionCriterion.cpp
- ComponentLibrary.cpp
- ConfigurableElement.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
+ 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
- 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)
include_directories(
include