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

Commit 02a52020 authored by vivek mehta's avatar vivek mehta Committed by Dhananjay Kumar
Browse files

audio: change TARGET_USES_AOSP to TARGET_USES_AOSP_FOR_AUDIO 

- add Audio specific Target_AOSP flag
- this will remove Audio dependency on Global Target AOSP flag

Change-Id: I4df84bbacb34756ad1809a34c95d6492e51e3772
parent 5538d2be

Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ include $(MY_LOCAL_PATH)/post_proc/Android.mk 
include $(MY_LOCAL_PATH)/qahw_api/Android.mk

endif



ifneq ($(TARGET_USES_AOSP), true)

ifneq ($(TARGET_USES_AOSP_FOR_AUDIO), true)

include $(MY_LOCAL_PATH)/audiod/Android.mk

endif

configs/msm8937/msm8937.mk

+3 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#BOARD_USES_GENERIC_AUDIO := true

BOARD_USES_ALSA_AUDIO := true



ifneq ($(TARGET_USES_AOSP), true)

ifneq ($(TARGET_USES_AOSP_FOR_AUDIO), true)

USE_CUSTOM_AUDIO_POLICY := 1

#AUDIO_FEATURE_ENABLED_VOICE_CONCURRENCY := true

AUDIO_FEATURE_ENABLED_AAC_ADTS_OFFLOAD := true
@@ -60,7 +60,7 @@ BOARD_SUPPORTS_QAHW := true 
DEVICE_PACKAGE_OVERLAYS += hardware/qcom/audio/configs/common/overlay



# Audio configuration file

ifeq ($(TARGET_USES_AOSP), true)

ifeq ($(TARGET_USES_AOSP_FOR_AUDIO), true)

PRODUCT_COPY_FILES += \

    device/qcom/common/media/audio_policy.conf:system/etc/audio_policy.conf

else
@@ -96,7 +96,7 @@ hardware/qcom/audio/configs/msm8937/aanc_tuning_mixer.txt:system/etc/aanc_tuning 


#XML Audio configuration files

ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)

ifeq ($(TARGET_USES_AOSP), true)

ifeq ($(TARGET_USES_AOSP_FOR_AUDIO), true)

PRODUCT_COPY_FILES += \

    $(TOPDIR)hardware/qcom/audio/configs/common/audio_policy_configuration.xml:/system/etc/audio_policy_configuration.xml

else

configs/msm8953/msm8953.mk

+3 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#BOARD_USES_GENERIC_AUDIO := true

BOARD_USES_ALSA_AUDIO := true



ifneq ($(TARGET_USES_AOSP), true)

ifneq ($(TARGET_USES_AOSP_FOR_AUDIO), true)

USE_CUSTOM_AUDIO_POLICY := 1

#AUDIO_FEATURE_ENABLED_VOICE_CONCURRENCY := true

AUDIO_FEATURE_ENABLED_AAC_ADTS_OFFLOAD := true
@@ -60,7 +60,7 @@ BOARD_SUPPORTS_QAHW := true 
DEVICE_PACKAGE_OVERLAYS += hardware/qcom/audio/configs/common/overlay



# Audio configuration file

ifeq ($(TARGET_USES_AOSP), true)

ifeq ($(TARGET_USES_AOSP_FOR_AUDIO), true)

PRODUCT_COPY_FILES += \

    device/qcom/common/media/audio_policy.conf:system/etc/audio_policy.conf

else
@@ -95,7 +95,7 @@ hardware/qcom/audio/configs/msm8953/aanc_tuning_mixer.txt:system/etc/aanc_tuning 


#XML Audio configuration files

ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)

ifeq ($(TARGET_USES_AOSP), true)

ifeq ($(TARGET_USES_AOSP_FOR_AUDIO), true)

PRODUCT_COPY_FILES += \

    $(TOPDIR)hardware/qcom/audio/configs/common/audio_policy_configuration.xml:/system/etc/audio_policy_configuration.xml

else

configs/msm8996/msm8996.mk

+3 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#AUDIO_FEATURE_FLAGS

BOARD_USES_ALSA_AUDIO := true



ifneq ($(TARGET_USES_AOSP), true)

ifneq ($(TARGET_USES_AOSP_FOR_AUDIO), true)

USE_CUSTOM_AUDIO_POLICY := 1

AUDIO_FEATURE_ENABLED_COMPRESS_CAPTURE := false

AUDIO_FEATURE_ENABLED_COMPRESS_VOIP := true
@@ -59,7 +59,7 @@ BOARD_SUPPORTS_QAHW := true 
DEVICE_PACKAGE_OVERLAYS += hardware/qcom/audio/configs/common/overlay



# Audio configuration file

ifeq ($(TARGET_USES_AOSP), true)

ifeq ($(TARGET_USES_AOSP_FOR_AUDIO), true)

PRODUCT_COPY_FILES += \

    device/qcom/common/media/audio_policy.conf:system/etc/audio_policy.conf

else
@@ -83,7 +83,7 @@ PRODUCT_COPY_FILES += \ 


#XML Audio configuration files

ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)

ifeq ($(TARGET_USES_AOSP), true)

ifeq ($(TARGET_USES_AOSP_FOR_AUDIO), true)

PRODUCT_COPY_FILES += \

    $(TOPDIR)hardware/qcom/audio/configs/common/audio_policy_configuration.xml:/system/etc/audio_policy_configuration.xml

else

configs/msm8998/msm8998.mk

+3 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#AUDIO_FEATURE_FLAGS

BOARD_USES_ALSA_AUDIO := true



ifneq ($(TARGET_USES_AOSP), true)

ifneq ($(TARGET_USES_AOSP_FOR_AUDIO), true)

USE_CUSTOM_AUDIO_POLICY := 1

AUDIO_FEATURE_ENABLED_COMPRESS_CAPTURE := false

AUDIO_FEATURE_ENABLED_COMPRESS_VOIP := true
@@ -64,7 +64,7 @@ AUDIO_FEATURE_ENABLED_RAS := true 
DEVICE_PACKAGE_OVERLAYS += hardware/qcom/audio/configs/common/overlay



# Audio configuration file

ifeq ($(TARGET_USES_AOSP), true)

ifeq ($(TARGET_USES_AOSP_FOR_AUDIO), true)

PRODUCT_COPY_FILES += \

    device/qcom/common/media/audio_policy.conf:system/etc/audio_policy.conf

else
@@ -94,7 +94,7 @@ PRODUCT_COPY_FILES += \ 


#XML Audio configuration files

ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)

ifeq ($(TARGET_USES_AOSP), true)

ifeq ($(TARGET_USES_AOSP_FOR_AUDIO), true)

PRODUCT_COPY_FILES += \

    $(TOPDIR)hardware/qcom/audio/configs/common/audio_policy_configuration.xml:/system/etc/audio_policy_configuration.xml

else