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

Commit 7d602f00 authored by Francois Gaffie's avatar Francois Gaffie Committed by Eric Laurent
Browse files

audiopolicy: engineconfigurable: prevents typo on strategy structure file 



This CL allows to generate at build time the ProductStrategy structure
file to ensure it is aligned with audio policy engine configuration file.

Bug: 124767636
Test: build

Change-Id: I1afba9602482a898147c685d4a8b03fbe99c08b1
Signed-off-by: default avatarFrancois Gaffie <francois.gaffie@renault.com>
parent 1812b4e7

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

+18 −3
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ PFW_SCHEMAS_DIR := $(PFW_DEFAULT_SCHEMAS_DIR) 
TOOLS := frameworks/av/services/audiopolicy/engineconfigurable/tools

BUILD_PFW_SETTINGS := $(TOOLS)/build_audio_pfw_settings.mk



PROVISION_STRATEGIES_STRUCTURE := $(TOOLS)/provision_strategies_structure.mk



endif



##################################################################
@@ -57,7 +59,7 @@ LOCAL_MODULE_TAGS := optional 
LOCAL_MODULE_CLASS := ETC

LOCAL_VENDOR_MODULE := true

LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Structure/Policy

LOCAL_SRC_FILES := Structure/$(LOCAL_MODULE)

LOCAL_SRC_FILES := common/Structure/$(LOCAL_MODULE)

include $(BUILD_PREBUILT)



include $(CLEAR_VARS)
@@ -66,9 +68,22 @@ LOCAL_MODULE_TAGS := optional 
LOCAL_MODULE_CLASS := ETC

LOCAL_VENDOR_MODULE := true

LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Structure/Policy

LOCAL_SRC_FILES := Structure/$(LOCAL_MODULE)

LOCAL_SRC_FILES := common/Structure/$(LOCAL_MODULE)

include $(BUILD_PREBUILT)





include $(CLEAR_VARS)

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



include $(PROVISION_STRATEGIES_STRUCTURE)



endif #ifeq ($(BUILD_AUDIO_POLICY_EXAMPLE_CONFIGURATION),$(filter $(BUILD_AUDIO_POLICY_EXAMPLE_CONFIGURATION),phone_configurable automotive_configurable))



########## Policy PFW Example Structures #########
@@ -86,7 +101,7 @@ LOCAL_REQUIRED_MODULES := \ 
    libpolicy-subsystem \



LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Structure/Policy

LOCAL_SRC_FILES := Structure/$(LOCAL_MODULE_STEM)

LOCAL_SRC_FILES := common/Structure/$(LOCAL_MODULE_STEM)

include $(BUILD_PREBUILT)



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

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

+1 −12
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ LOCAL_MODULE_TAGS := optional 
LOCAL_MODULE_CLASS := ETC

LOCAL_VENDOR_MODULE := true

LOCAL_REQUIRED_MODULES := \

    ProductStrategies.xml.car \

    ProductStrategies.xml \

    PolicySubsystem-Volume.xml \

    PolicySubsystem-CommonTypes.xml \

    libpolicy-subsystem
@@ -40,17 +40,6 @@ LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Structure/Policy 
LOCAL_SRC_FILES := Structure/$(LOCAL_MODULE_STEM)

include $(BUILD_PREBUILT)





include $(CLEAR_VARS)

LOCAL_MODULE := ProductStrategies.xml.car

LOCAL_MODULE_STEM := ProductStrategies.xml

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_CLASS := ETC

LOCAL_VENDOR_MODULE := true

LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Structure/Policy

LOCAL_SRC_FILES := Structure/$(LOCAL_MODULE_STEM)

include $(BUILD_PREBUILT)



######### Policy PFW Settings #########

include $(CLEAR_VARS)

LOCAL_MODULE := parameter-framework.policy.car

services/audiopolicy/engineconfigurable/parameter-framework/examples/Car/Structure/ProductStrategies.xml

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!-- Copyright (C) 2018 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<ComponentTypeSet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

              xmlns:xi="http://www.w3.org/2001/XInclude"

              xsi:noNamespaceSchemaLocation="Schemas/ComponentTypeSet.xsd">



  <ComponentType Name="ProductStrategies" Description="">

      <Component Name="oem_traffic_anouncement" Type="ProductStrategy"/>

      <Component Name="oem_strategy_1" Type="ProductStrategy"/>

      <Component Name="oem_strategy_2" Type="ProductStrategy"/>



      <Component Name="radio" Type="ProductStrategy"/>

      <Component Name="ext_audio_source" Type="ProductStrategy"/>

      <Component Name="voice_command" Type="ProductStrategy"/>

      <Component Name="safety_alert" Type="ProductStrategy"/>



      <Component Name="music" Type="ProductStrategy"/>

      <Component Name="nav_guidance" Type="ProductStrategy"/>

      <Component Name="voice_call" Type="ProductStrategy"/>

      <Component Name="alarm" Type="ProductStrategy"/>

      <Component Name="ring" Type="ProductStrategy"/>

      <Component Name="notification" Type="ProductStrategy"/>

      <Component Name="system" Type="ProductStrategy"/>

  </ComponentType>



</ComponentTypeSet>

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

+1 −12
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ LOCAL_MODULE_CLASS := ETC 
LOCAL_VENDOR_MODULE := true

LOCAL_REQUIRED_MODULES := \

    PolicySubsystem-CommonTypes.xml \

    ProductStrategies.xml.phone \

    ProductStrategies.xml \

    PolicySubsystem-Volume.xml \

    libpolicy-subsystem \
@@ -39,17 +39,6 @@ LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Structure/Policy 
LOCAL_SRC_FILES := Structure/$(LOCAL_MODULE_STEM)

include $(BUILD_PREBUILT)





include $(CLEAR_VARS)

LOCAL_MODULE := ProductStrategies.xml.phone

LOCAL_MODULE_STEM := ProductStrategies.xml

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_CLASS := ETC

LOCAL_VENDOR_MODULE := true

LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Structure/Policy

LOCAL_SRC_FILES := Structure/$(LOCAL_MODULE_STEM)

include $(BUILD_PREBUILT)



######### Policy PFW Settings #########

include $(CLEAR_VARS)

LOCAL_MODULE := parameter-framework.policy.phone

services/audiopolicy/engineconfigurable/parameter-framework/examples/Structure/PolicyClass.xml→services/audiopolicy/engineconfigurable/parameter-framework/examples/common/Structure/PolicyClass.xml

+0 −0

File moved.

View file