audiopolicy: engineconfigurable: fix PATH issue am: bc5c7de704 am: ed29c951f0 am: f05f6c3363 (fe27c711) · Commits · e / os / android_frameworks_av

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

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -154,6 +154,7 @@ PFW_EDD_FILES := \
	$(LOCAL_PATH)/Settings/device_for_input_source.pfw \		$(LOCAL_PATH)/Settings/device_for_input_source.pfw \
	$(LOCAL_PATH)/Settings/volumes.pfw		$(LOCAL_PATH)/Settings/volumes.pfw
	LOCAL_REQUIRED_MODULES := libpolicy-subsystem		LOCAL_REQUIRED_MODULES := libpolicy-subsystem
			PFW_DOMAIN_GENERATOR_TOOL := $(HOST_OUT_EXECUTABLES)/domainGeneratorConnector
	include $(BUILD_PFW_SETTINGS)		include $(BUILD_PFW_SETTINGS)

	endif # ifeq ($(BUILD_AUDIO_POLICY_EXAMPLE_CONFIGURATION),no-output_configurable)		endif # ifeq ($(BUILD_AUDIO_POLICY_EXAMPLE_CONFIGURATION),no-output_configurable)
	@@ -174,6 +175,7 @@ PFW_EDD_FILES := \
	$(LOCAL_PATH)/SettingsNoInput/device_for_input_source.pfw \		$(LOCAL_PATH)/SettingsNoInput/device_for_input_source.pfw \
	$(LOCAL_PATH)/Settings/volumes.pfw		$(LOCAL_PATH)/Settings/volumes.pfw
	LOCAL_REQUIRED_MODULES := libpolicy-subsystem		LOCAL_REQUIRED_MODULES := libpolicy-subsystem
			PFW_DOMAIN_GENERATOR_TOOL := $(HOST_OUT_EXECUTABLES)/domainGeneratorConnector
	include $(BUILD_PFW_SETTINGS)		include $(BUILD_PFW_SETTINGS)

	endif #ifeq ($(BUILD_AUDIO_POLICY_EXAMPLE_CONFIGURATION),no-input_configurable)		endif #ifeq ($(BUILD_AUDIO_POLICY_EXAMPLE_CONFIGURATION),no-input_configurable)

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -41,6 +41,7 @@ PFW_CRITERION_TYPES_FILE := $(TARGET_OUT_VENDOR_ETC)/audio_policy_engine_criteri
	PFW_CRITERIA_FILE := $(TARGET_OUT_VENDOR_ETC)/audio_policy_engine_criteria.xml		PFW_CRITERIA_FILE := $(TARGET_OUT_VENDOR_ETC)/audio_policy_engine_criteria.xml
	PFW_TOPLEVEL_FILE := $(TARGET_OUT_VENDOR_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml		PFW_TOPLEVEL_FILE := $(TARGET_OUT_VENDOR_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml
	PFW_SCHEMAS_DIR := $(PFW_DEFAULT_SCHEMAS_DIR)		PFW_SCHEMAS_DIR := $(PFW_DEFAULT_SCHEMAS_DIR)
			PFW_DOMAIN_GENERATOR_TOOL := $(HOST_OUT_EXECUTABLES)/domainGeneratorConnector

	include $(BUILD_PFW_SETTINGS)		include $(BUILD_PFW_SETTINGS)

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -40,6 +40,7 @@ PFW_CRITERION_TYPES_FILE := $(TARGET_OUT_VENDOR_ETC)/audio_policy_engine_criteri
	PFW_CRITERIA_FILE := $(TARGET_OUT_VENDOR_ETC)/audio_policy_engine_criteria.xml		PFW_CRITERIA_FILE := $(TARGET_OUT_VENDOR_ETC)/audio_policy_engine_criteria.xml
	PFW_TOPLEVEL_FILE := $(TARGET_OUT_VENDOR_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml		PFW_TOPLEVEL_FILE := $(TARGET_OUT_VENDOR_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml
	PFW_SCHEMAS_DIR := $(PFW_DEFAULT_SCHEMAS_DIR)		PFW_SCHEMAS_DIR := $(PFW_DEFAULT_SCHEMAS_DIR)
			PFW_DOMAIN_GENERATOR_TOOL := $(HOST_OUT_EXECUTABLES)/domainGeneratorConnector

	include $(BUILD_PFW_SETTINGS)		include $(BUILD_PFW_SETTINGS)

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -48,6 +48,7 @@ PFW_CRITERION_TYPES_FILE := $(TARGET_OUT_VENDOR_ETC)/audio_policy_engine_criteri
	PFW_CRITERIA_FILE := $(TARGET_OUT_VENDOR_ETC)/audio_policy_engine_criteria.xml		PFW_CRITERIA_FILE := $(TARGET_OUT_VENDOR_ETC)/audio_policy_engine_criteria.xml
	PFW_TOPLEVEL_FILE := $(TARGET_OUT_VENDOR_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml		PFW_TOPLEVEL_FILE := $(TARGET_OUT_VENDOR_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml
	PFW_SCHEMAS_DIR := $(PFW_DEFAULT_SCHEMAS_DIR)		PFW_SCHEMAS_DIR := $(PFW_DEFAULT_SCHEMAS_DIR)
			PFW_DOMAIN_GENERATOR_TOOL := $(HOST_OUT_EXECUTABLES)/domainGeneratorConnector

	include $(BUILD_PFW_SETTINGS)		include $(BUILD_PFW_SETTINGS)

services/audiopolicy/engineconfigurable/tools/build_audio_pfw_settings.mk

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2,6 +2,7 @@ LOCAL_MODULE_CLASS := ETC
	LOCAL_MODULE_TAGS := optional		LOCAL_MODULE_TAGS := optional
	LOCAL_ADDITIONAL_DEPENDENCIES += \		LOCAL_ADDITIONAL_DEPENDENCIES += \
	$(HOST_OUT_EXECUTABLES)/domainGeneratorPolicy.py \		$(HOST_OUT_EXECUTABLES)/domainGeneratorPolicy.py \
			$(PFW_DOMAIN_GENERATOR_TOOL) \
	$(PFW_TOPLEVEL_FILE) $(PFW_CRITERIA_FILE) $(PFW_CRITERION_TYPES_FILE)		$(PFW_TOPLEVEL_FILE) $(PFW_CRITERIA_FILE) $(PFW_CRITERION_TYPES_FILE)

	include $(BUILD_SYSTEM)/base_rules.mk		include $(BUILD_SYSTEM)/base_rules.mk
	@@ -15,9 +16,11 @@ $(LOCAL_BUILT_MODULE): MY_EDD_FILES := $(PFW_EDD_FILES)
	$(LOCAL_BUILT_MODULE): MY_DOMAIN_FILES := $(PFW_DOMAIN_FILES)		$(LOCAL_BUILT_MODULE): MY_DOMAIN_FILES := $(PFW_DOMAIN_FILES)
	$(LOCAL_BUILT_MODULE): MY_SCHEMAS_DIR := $(PFW_SCHEMAS_DIR)		$(LOCAL_BUILT_MODULE): MY_SCHEMAS_DIR := $(PFW_SCHEMAS_DIR)
	$(LOCAL_BUILT_MODULE): MY_CRITERION_TYPES_FILE := $(PFW_CRITERION_TYPES_FILE)		$(LOCAL_BUILT_MODULE): MY_CRITERION_TYPES_FILE := $(PFW_CRITERION_TYPES_FILE)
			$(LOCAL_BUILT_MODULE): MY_DOMAIN_GENERATOR_TOOL := $(PFW_DOMAIN_GENERATOR_TOOL)
	$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)		$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)

	"$(MY_TOOL)" --validate \		"$(MY_TOOL)" --validate \
			--domain-generator-tool "$(MY_DOMAIN_GENERATOR_TOOL)" \
	--toplevel-config "$(MY_TOPLEVEL_FILE)" \		--toplevel-config "$(MY_TOPLEVEL_FILE)" \
	--criteria "$(MY_CRITERIA_FILE)" \		--criteria "$(MY_CRITERIA_FILE)" \
	--criteriontypes "$(MY_CRITERION_TYPES_FILE)" \		--criteriontypes "$(MY_CRITERION_TYPES_FILE)" \
	@@ -36,3 +39,4 @@ PFW_TUNING_FILE :=
	PFW_EDD_FILES :=		PFW_EDD_FILES :=
	PFW_DOMAIN_FILES :=		PFW_DOMAIN_FILES :=
	PFW_SCHEMAS_DIR := $(PFW_DEFAULT_SCHEMAS_DIR)		PFW_SCHEMAS_DIR := $(PFW_DEFAULT_SCHEMAS_DIR)
			PFW_DOMAIN_GENERATOR_TOOL :=