audiopolicy: engineconfigurable: Get rid of criteria text file (fc078cd2) · Commits · e / os / android_frameworks_av

services/audiopolicy/engineconfigurable/parameter-framework/examples/Android.mk

+41 −14

Original line number	Diff line number	Diff line
		@@ -12,10 +12,14 @@ LOCAL_PATH := $(call my-dir)
		ifeq ($(BUILD_AUDIO_POLICY_EXAMPLE_CONFIGURATION), 1)

		PFW_CORE := external/parameter-framework
		BUILD_PFW_SETTINGS := $(PFW_CORE)/support/android/build_pfw_settings.mk
		#@TODO: upstream new domain generator
		#BUILD_PFW_SETTINGS := $(PFW_CORE)/support/android/build_pfw_settings.mk
		PFW_DEFAULT_SCHEMAS_DIR := $(PFW_CORE)/upstream/schemas
		PFW_SCHEMAS_DIR := $(PFW_DEFAULT_SCHEMAS_DIR)

		TOOLS := frameworks/av/services/audiopolicy/engineconfigurable/tools
		BUILD_PFW_SETTINGS := $(TOOLS)/build_audio_pfw_settings.mk

		##################################################################
		# CONFIGURATION FILES
		##################################################################
		@@ -82,13 +86,13 @@ LOCAL_MODULE_CLASS := ETC
		LOCAL_VENDOR_MODULE := true
		LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Settings/Policy
		LOCAL_REQUIRED_MODULES := \
		PolicyClass.xml \
		policy_criteria.xml \
		policy_criterion_types.xml \
		PolicySubsystem.xml \
		PolicyClass.xml \
		ParameterFrameworkConfigurationPolicy.xml

		ifeq ($(pfw_rebuild_settings),true)
		PFW_TOPLEVEL_FILE := $(TARGET_OUT_VENDOR_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml
		PFW_CRITERIA_FILE := $(LOCAL_PATH)/policy_criteria.txt
		PFW_EDD_FILES := \
		$(LOCAL_PATH)/Settings/device_for_strategy_media.pfw \
		$(LOCAL_PATH)/Settings/device_for_strategy_phone.pfw \
		@@ -104,6 +108,17 @@ PFW_EDD_FILES := \
		$(LOCAL_PATH)/Settings/device_for_input_source.pfw \
		$(LOCAL_PATH)/Settings/volumes.pfw

		LOCAL_ADDITIONAL_DEPENDENCIES := \
		$(PFW_EDD_FILES)


		PFW_CRITERION_TYPES_FILE := $(TARGET_OUT_VENDOR_ETC)/policy_criterion_types.xml
		PFW_CRITERIA_FILE := $(TARGET_OUT_VENDOR_ETC)/policy_criteria.xml

		PFW_TOPLEVEL_FILE := $(TARGET_OUT_VENDOR_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml

		PFW_SCHEMAS_DIR := $(PFW_DEFAULT_SCHEMAS_DIR)

		include $(BUILD_PFW_SETTINGS)
		else
		# Use the existing file
		@@ -123,12 +138,15 @@ LOCAL_MODULE_CLASS := ETC
		LOCAL_VENDOR_MODULE := true
		LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Settings/Policy
		LOCAL_REQUIRED_MODULES := \
		PolicyClass.xml \
		policy_criteria.xml \
		policy_criterion_types.xml \
		PolicySubsystem.xml \
		PolicyClass.xml \
		ParameterFrameworkConfigurationPolicy.xml

		PFW_TOPLEVEL_FILE := $(TARGET_OUT_VENDOR_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml
		PFW_CRITERIA_FILE := $(LOCAL_PATH)/policy_criteria.txt
		PFW_CRITERION_TYPES_FILE := $(TARGET_OUT_VENDOR_ETC)/policy_criterion_types.xml
		PFW_CRITERIA_FILE := $(TARGET_OUT_VENDOR_ETC)/policy_criteria.xml
		PFW_EDD_FILES := \
		$(LOCAL_PATH)/SettingsNoOutput/device_for_strategies.pfw \
		$(LOCAL_PATH)/Settings/strategy_for_stream.pfw \
		@@ -148,12 +166,15 @@ LOCAL_MODULE_CLASS := ETC
		LOCAL_VENDOR_MODULE := true
		LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Settings/Policy
		LOCAL_REQUIRED_MODULES := \
		PolicyClass.xml \
		policy_criteria.xml \
		policy_criterion_types.xml \
		PolicySubsystem.xml \
		PolicyClass.xml \
		ParameterFrameworkConfigurationPolicy.xml

		PFW_TOPLEVEL_FILE := $(TARGET_OUT_VENDOR_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml
		PFW_CRITERIA_FILE := $(LOCAL_PATH)/policy_criteria.txt
		PFW_CRITERION_TYPES_FILE := $(TARGET_OUT_VENDOR_ETC)/policy_criterion_types.xml
		PFW_CRITERIA_FILE := $(TARGET_OUT_VENDOR_ETC)/policy_criteria.xml
		PFW_EDD_FILES := \
		$(LOCAL_PATH)/Settings/device_for_strategy_media.pfw \
		$(LOCAL_PATH)/Settings/device_for_strategy_phone.pfw \
		@@ -172,3 +193,9 @@ PFW_EDD_FILES := \
		include $(BUILD_PFW_SETTINGS)

		endif # ifeq (1, 0)

		#######################################################################
		# Recursive call sub-folder Android.mk
		#######################################################################

		include $(call all-makefiles-under,$(LOCAL_PATH))

services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/PolicyConfigurableDomains.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -8472,7 +8472,7 @@
		<Configurations>
		<Configuration Name="Sonification">
		<CompoundRule Type="All">
		<SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="RingTone"/>
		<SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="Ringtone"/>
		</CompoundRule>
		</Configuration>
		<Configuration Name="Phone">

services/audiopolicy/engineconfigurable/parameter-framework/examples/Settings/strategy_for_usage.pfw

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ supDomain: SelectedStrategyForUsages
		# In case of Ring or Alarm stream type active, switching to sonification
		# @todo: handle this dynamic case. As a WA, using Ringtone mode...
		#
		TelephonyMode Is RingTone
		TelephonyMode Is Ringtone

		/Policy/policy/usages/assistance_accessibility/applicable_strategy/strategy = sonification

services/audiopolicy/engineconfigurable/parameter-framework/examples/policy_criteria.txt

deleted100644 → 0

+0 −10

Original line number	Diff line number	Diff line
		ExclusiveCriterion TelephonyMode : Normal RingTone InCall InCommunication
		InclusiveCriterion AvailableInputDevices : Communication Ambient BuiltinMic BluetoothScoHeadset WiredHeadset Hdmi TelephonyRx BackMic RemoteSubmix AnlgDockHeadset DgtlDockHeadset UsbAccessory UsbDevice FmTuner TvTuner Line Spdif BluetoothA2dp Loopback Ip Bus Stub
		InclusiveCriterion AvailableOutputDevices : Earpiece Speaker WiredSpeaker WiredHeadset WiredHeadphone BluetoothSco BluetoothScoHeadset BluetoothScoCarkit BluetoothA2dp BluetoothA2dpHeadphones BluetoothA2dpSpeaker Hdmi AnlgDockHeadset DgtlDockHeadset UsbAccessory UsbDevice RemoteSubmix TelephonyTx Line HdmiArc Spdif Fm AuxLine SpeakerSafe Ip Bus Stub
		ExclusiveCriterion ForceUseForCommunication : ForceNone ForceSpeaker ForceBtSco
		ExclusiveCriterion ForceUseForMedia : ForceNone ForceSpeaker ForceHeadphones ForceBtA2dp ForceWiredAccessory ForceAnalogDock ForceDigitalDock ForceNoBtA2dp ForceSystemEnforced
		ExclusiveCriterion ForceUseForRecord : ForceNone ForceBtSco ForceWiredAccessory
		ExclusiveCriterion ForceUseForDock : ForceNone ForceWiredAccessory ForceBtCarDock ForceBtDeskDock ForceAnalogDock ForceDigitalDock
		ExclusiveCriterion ForceUseForSystem : ForceNone ForceSystemEnforced
		ExclusiveCriterion ForceUseForHdmiSystemAudio : ForceNone ForceHdmiSystemEnforced
		ExclusiveCriterion ForceUseForEncodedSurround : ForceNone ForceEncodedSurroundNever ForceEncodedSurroundAlways

services/audiopolicy/engineconfigurable/tools/build_audio_pfw_settings.mk

0 → 100644

+35 −0

Original line number	Diff line number	Diff line
		LOCAL_MODULE_CLASS := ETC
		LOCAL_MODULE_TAGS := optional

		include $(BUILD_SYSTEM)/base_rules.mk

		$(LOCAL_BUILT_MODULE): MY_CRITERION_TYPES_FILE := $(PFW_CRITERION_TYPES_FILE)
		$(LOCAL_BUILT_MODULE): MY_TOOL := domainGeneratorPolicy.py
		$(LOCAL_BUILT_MODULE): MY_TOPLEVEL_FILE := $(PFW_TOPLEVEL_FILE)
		$(LOCAL_BUILT_MODULE): MY_CRITERIA_FILE := $(PFW_CRITERIA_FILE)
		$(LOCAL_BUILT_MODULE): MY_TUNING_FILE := $(PFW_TUNING_FILE)
		$(LOCAL_BUILT_MODULE): MY_EDD_FILES := $(PFW_EDD_FILES)
		$(LOCAL_BUILT_MODULE): MY_DOMAIN_FILES := $(PFW_DOMAIN_FILES)
		$(LOCAL_BUILT_MODULE): MY_SCHEMAS_DIR := $(PFW_SCHEMAS_DIR)
		$(LOCAL_BUILT_MODULE): MY_CRITERION_TYPES_FILE := $(PFW_CRITERION_TYPES_FILE)
		$(LOCAL_BUILT_MODULE): $(LOCAL_REQUIRED_MODULES) $(LOCAL_ADDITIONAL_DEPENDENCIES) domainGeneratorPolicy.py

		"$(MY_TOOL)" --validate \
		--toplevel-config "$(MY_TOPLEVEL_FILE)" \
		--criteria "$(MY_CRITERIA_FILE)" \
		--criteriontypes "$(MY_CRITERION_TYPES_FILE)" \
		--initial-settings $(MY_TUNING_FILE) \
		--add-edds $(MY_EDD_FILES) \
		--add-domains $(MY_DOMAIN_FILES) \
		--schemas-dir $(MY_SCHEMAS_DIR) > "$@"


		# Clear variables for further use
		PFW_TOPLEVEL_FILE :=
		PFW_STRUCTURE_FILES :=
		PFW_CRITERIA_FILE :=
		PFW_CRITERION_TYPES_FILE :=
		PFW_TUNING_FILE :=
		PFW_EDD_FILES :=
		PFW_DOMAIN_FILES :=
		PFW_SCHEMAS_DIR := $(PFW_DEFAULT_SCHEMAS_DIR)