Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df7f0a20 authored by François Gaffie's avatar François Gaffie Committed by Eric Laurent
Browse files

audiopolicy: engineconfigurable: fix build issues on Q environment 



This CL fixes the compilation issues met while generating configuration files.

@todo: TEMPORARY_DISABLE_PATH_RESTRICTIONS=true is still required to use
subprocess.Popen(["domainGeneratorConnector",...) on external/parameter-framework

@todo: CL mixing in parameter-framework leading to validation failure

Bug: 130284799
Test: make

Change-Id: I495026781af63f3c3a538b00fe467d39f58baa70
Signed-off-by: default avatarFrançois Gaffie <francois.gaffie@renault.com>
parent 8263e351

services/audiopolicy/engineconfigurable/config/example/Android.mk

+1 −3
Original line number Diff line number Diff line
@@ -137,9 +137,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := audio_policy_engine_criterion_types.xml

LOCAL_MODULE_CLASS := ETC

LOCAL_VENDOR_MODULE := true

LOCAL_ADDITIONAL_DEPENDENCIES := \

    $(TARGET_OUT_VENDOR_ETC)/audio_policy_configuration.xml



LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_VENDOR_ETC)/primary_audio_policy_configuration.xml

ANDROID_AUDIO_BASE_HEADER_FILE := system/media/audio/include/system/audio-base.h

AUDIO_POLICY_CONFIGURATION_FILE := $(TARGET_OUT_VENDOR_ETC)/audio_policy_configuration.xml

CRITERION_TYPES_FILE := $(LOCAL_PATH)/common/$(LOCAL_MODULE).in

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

+25 −23
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ LOCAL_MODULE_CLASS := ETC 
LOCAL_VENDOR_MODULE := true

LOCAL_MODULE_RELATIVE_PATH := parameter-framework

LOCAL_SRC_FILES := $(LOCAL_MODULE).in

LOCAL_REQUIRED_MODULES := \

    PolicySubsystem.xml\

    PolicyClass.xml



# external/parameter-framework prevents from using debug interface

AUDIO_PATTERN = @TUNING_ALLOWED@
@@ -60,9 +63,7 @@ LOCAL_MODULE_CLASS := ETC 
LOCAL_VENDOR_MODULE := true

LOCAL_REQUIRED_MODULES := \

    PolicySubsystem-CommonTypes.xml \

    ProductStrategies.xml \

    PolicySubsystem-Volume.xml \

    libpolicy-subsystem \

    ProductStrategies.xml



LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Structure/Policy

LOCAL_SRC_FILES := common/Structure/$(LOCAL_MODULE)
@@ -92,7 +93,7 @@ LOCAL_MODULE := ProductStrategies.xml 
LOCAL_MODULE_CLASS := ETC

LOCAL_VENDOR_MODULE := true

LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Structure/Policy

LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_VENDOR_ETC)/audio_policy_engine_configuration.xml



AUDIO_POLICY_ENGINE_CONFIGURATION_FILE := \

    $(TARGET_OUT_VENDOR_ETC)/audio_policy_engine_configuration.xml

STRATEGIES_STRUCTURE_FILE := $(LOCAL_PATH)/common/Structure/$(LOCAL_MODULE).in
@@ -110,15 +111,27 @@ LOCAL_MODULE_STEM := PolicySubsystem.xml 
LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_CLASS := ETC

LOCAL_VENDOR_MODULE := true

LOCAL_REQUIRED_MODULES := \

    PolicySubsystem-CommonTypes.xml \

    PolicySubsystem-Volume.xml \

    libpolicy-subsystem \

LOCAL_REQUIRED_MODULES := PolicySubsystem-CommonTypes.xml



LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Structure/Policy

LOCAL_SRC_FILES := common/Structure/$(LOCAL_MODULE_STEM)

include $(BUILD_PREBUILT)



include $(CLEAR_VARS)

LOCAL_MODULE := ParameterFrameworkConfigurationPolicy.xml

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_CLASS := ETC

LOCAL_VENDOR_MODULE := true

LOCAL_MODULE_RELATIVE_PATH := parameter-framework

LOCAL_SRC_FILES := $(LOCAL_MODULE).in

LOCAL_REQUIRED_MODULES := \

    PolicySubsystem-no-strategy.xml\

    PolicyClass.xml

AUDIO_VALUE = false

LOCAL_POST_INSTALL_CMD := $(hide) sed -i -e 's|$(AUDIO_PATTERN)|$(AUDIO_VALUE)|g' $(TARGET_OUT_VENDOR_ETC)/$(LOCAL_MODULE_RELATIVE_PATH)/$(LOCAL_MODULE)



include $(BUILD_PREBUILT)



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



######### Policy PFW Settings - No Output #########
@@ -130,12 +143,6 @@ LOCAL_MODULE_STEM := PolicyConfigurableDomains-NoOutputDevice.xml 
LOCAL_MODULE_CLASS := ETC

LOCAL_VENDOR_MODULE := true

LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Settings/Policy

LOCAL_REQUIRED_MODULES := \

    audio_policy_engine_criteria.xml \

    audio_policy_engine_criterion_types.xml \

    PolicySubsystem-no-strategy.xml \

    PolicyClass.xml \

    ParameterFrameworkConfigurationPolicy.xml



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

PFW_CRITERION_TYPES_FILE := $(TARGET_OUT_VENDOR_ETC)/audio_policy_engine_criterion_types.xml
@@ -144,8 +151,9 @@ PFW_EDD_FILES := \ 
        $(LOCAL_PATH)/SettingsNoOutput/device_for_strategies.pfw \

        $(LOCAL_PATH)/Settings/device_for_input_source.pfw \

        $(LOCAL_PATH)/Settings/volumes.pfw        



LOCAL_REQUIRED_MODULES := libpolicy-subsystem

include $(BUILD_PFW_SETTINGS)



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

######### Policy PFW Settings - No Input #########

ifeq ($(BUILD_AUDIO_POLICY_EXAMPLE_CONFIGURATION),no-input_configurable)
@@ -156,12 +164,6 @@ LOCAL_MODULE_STEM := PolicyConfigurableDomains-NoInputDevice.xml 
LOCAL_MODULE_CLASS := ETC

LOCAL_VENDOR_MODULE := true

LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Settings/Policy

LOCAL_REQUIRED_MODULES := \

    audio_policy_engine_criteria.xml \

    audio_policy_engine_criterion_types.xml \

    PolicySubsystem-no-strategy.xml \

    PolicyClass.xml \

    ParameterFrameworkConfigurationPolicy.xml



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

PFW_CRITERION_TYPES_FILE := $(TARGET_OUT_VENDOR_ETC)/audio_policy_engine_criterion_types.xml
@@ -169,7 +171,7 @@ PFW_CRITERIA_FILE := $(TARGET_OUT_VENDOR_ETC)/audio_policy_engine_criteria.xml 
PFW_EDD_FILES := \

        $(LOCAL_PATH)/SettingsNoInput/device_for_input_source.pfw \

        $(LOCAL_PATH)/Settings/volumes.pfw



LOCAL_REQUIRED_MODULES := libpolicy-subsystem

include $(BUILD_PFW_SETTINGS)



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

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

+4 −15
Original line number Diff line number Diff line
@@ -30,27 +30,16 @@ LOCAL_MODULE_STEM := PolicyConfigurableDomains.xml 
LOCAL_MODULE_CLASS := ETC

LOCAL_VENDOR_MODULE := true

LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Settings/Policy

LOCAL_REQUIRED_MODULES := libpolicy-subsystem



PFW_EDD_FILES := \

    $(LOCAL_PATH)/Settings/device_for_product_strategies.pfw \

    $(LOCAL_PATH)/../Settings/device_for_input_source.pfw \

    $(LOCAL_PATH)/../Settings/volumes.pfw



LOCAL_ADDITIONAL_DEPENDENCIES := \

    $(PFW_EDD_FILES)



LOCAL_REQUIRED_MODULES := \

    PolicySubsystem.xml \

    PolicyClass.xml \

    audio_policy_engine_criteria.xml \

    audio_policy_engine_criterion_types.xml \

    ParameterFrameworkConfigurationPolicy.xml



PFW_CRITERION_TYPES_FILE := $(TARGET_OUT_VENDOR_ETC)/audio_policy_engine_criterion_types.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_SCHEMAS_DIR := $(PFW_DEFAULT_SCHEMAS_DIR)



include $(BUILD_PFW_SETTINGS)

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

+4 −16
Original line number Diff line number Diff line
@@ -30,27 +30,15 @@ LOCAL_MODULE_STEM := PolicyConfigurableDomains.xml 
LOCAL_MODULE_CLASS := ETC

LOCAL_VENDOR_MODULE := true

LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Settings/Policy

LOCAL_REQUIRED_MODULES := libpolicy-subsystem



PFW_EDD_FILES := \

    $(LOCAL_PATH)/Settings/device_for_product_strategies.pfw \

    $(LOCAL_PATH)/../Settings/device_for_input_source.pfw \

    $(LOCAL_PATH)/../Settings/volumes.pfw



LOCAL_ADDITIONAL_DEPENDENCIES := \

    $(PFW_EDD_FILES)



LOCAL_REQUIRED_MODULES := \

    PolicySubsystem.xml \

    PolicyClass.xml \

    audio_policy_engine_criteria.xml \

    audio_policy_engine_criterion_types.xml \

    ParameterFrameworkConfigurationPolicy.xml



PFW_CRITERION_TYPES_FILE := $(TARGET_OUT_VENDOR_ETC)/audio_policy_engine_criterion_types.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_SCHEMAS_DIR := $(PFW_DEFAULT_SCHEMAS_DIR)



include $(BUILD_PFW_SETTINGS)

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

+1 −13
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ LOCAL_MODULE_STEM := PolicyConfigurableDomains.xml 
LOCAL_MODULE_CLASS := ETC

LOCAL_VENDOR_MODULE := true

LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Settings/Policy

LOCAL_REQUIRED_MODULES := libpolicy-subsystem



PFW_EDD_FILES := \

        $(LOCAL_PATH)/../Settings/device_for_input_source.pfw \
@@ -43,22 +44,9 @@ PFW_EDD_FILES := \ 
        $(LOCAL_PATH)/Settings/device_for_product_strategy_transmitted_through_speaker.pfw \

        $(LOCAL_PATH)/Settings/device_for_product_strategy_rerouting.pfw \

        $(LOCAL_PATH)/Settings/device_for_product_strategy_patch.pfw



LOCAL_ADDITIONAL_DEPENDENCIES := \

    $(PFW_EDD_FILES)



LOCAL_REQUIRED_MODULES := \

    PolicySubsystem.xml \

    PolicyClass.xml \

    audio_policy_engine_criteria.xml \

    audio_policy_engine_criterion_types.xml \

    ParameterFrameworkConfigurationPolicy.xml



PFW_CRITERION_TYPES_FILE := $(TARGET_OUT_VENDOR_ETC)/audio_policy_engine_criterion_types.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_SCHEMAS_DIR := $(PFW_DEFAULT_SCHEMAS_DIR)



include $(BUILD_PFW_SETTINGS)