diff options
| author | Steve Pfetsch <spfetsch@google.com> | 2016-02-06 00:31:10 -0800 |
|---|---|---|
| committer | Steve Pfetsch <spfetsch@google.com> | 2016-02-06 00:31:10 -0800 |
| commit | a7cca24fea34b4d6fc0e43c7b6db9190d1acfec1 (patch) | |
| tree | 5abed8cfb24ba5752067ead1aa7e7babc615ff34 | |
| parent | 374795fa81ac3eef636f682c5d2871a1658f5f4d (diff) | |
| download | platform_hardware_qcom_audio-a7cca24fea34b4d6fc0e43c7b6db9190d1acfec1.tar.gz platform_hardware_qcom_audio-a7cca24fea34b4d6fc0e43c7b6db9190d1acfec1.tar.bz2 platform_hardware_qcom_audio-a7cca24fea34b4d6fc0e43c7b6db9190d1acfec1.zip | |
Revert "hal: enable audio hal on msm8996"
This reverts commit 81f82dade75c5e27cf793a2fe06e428ef920ffa5.
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | hal/Android.mk | 10 | ||||
| -rw-r--r-- | post_proc/Android.mk | 4 |
3 files changed, 5 insertions, 11 deletions
@@ -1,6 +1,6 @@ # TODO: Find a better way to separate build configs for ADP vs non-ADP devices ifneq ($(TARGET_BOARD_AUTO),true) - ifneq ($(filter msm8960 msm8226 msm8x26 msm8974 msm8x74 msm8x84 msm8084 msm8992 msm8994 msm8996,$(TARGET_BOARD_PLATFORM)),) + ifneq ($(filter msm8960 msm8226 msm8x26 msm8974 msm8x74 msm8x84 msm8084 msm8992 msm8994,$(TARGET_BOARD_PLATFORM)),) MY_LOCAL_PATH := $(call my-dir) diff --git a/hal/Android.mk b/hal/Android.mk index d55e37a..d482e97 100644 --- a/hal/Android.mk +++ b/hal/Android.mk @@ -10,7 +10,7 @@ AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM) ifneq ($(filter msm8960,$(TARGET_BOARD_PLATFORM)),) LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="2" endif -ifneq ($(filter msm8974 msm8226 msm8084 msm8992 msm8994 msm8996,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter msm8974 msm8226 msm8084 msm8992 msm8994,$(TARGET_BOARD_PLATFORM)),) # B-family platform uses msm8974 code base AUDIO_PLATFORM = msm8974 ifneq ($(filter msm8974,$(TARGET_BOARD_PLATFORM)),) @@ -35,12 +35,6 @@ ifneq ($(filter msm8994,$(TARGET_BOARD_PLATFORM)),) LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="4" LOCAL_CFLAGS += -DKPI_OPTIMIZE_ENABLED endif -ifneq ($(filter msm8996,$(TARGET_BOARD_PLATFORM)),) - LOCAL_CFLAGS := -DPLATFORM_MSM8996 - LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="4" - LOCAL_CFLAGS += -DKPI_OPTIMIZE_ENABLED -endif - endif LOCAL_SRC_FILES := \ @@ -105,7 +99,7 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DSM_FEEDBACK)),true) LOCAL_SRC_FILES += audio_extn/dsm_feedback.c endif -ifneq ($(filter msm8992 msm8994 msm8996,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter msm8992 msm8994,$(TARGET_BOARD_PLATFORM)),) # push codec/mad calibration to HW dep node # applicable to msm8992/8994 or newer platforms LOCAL_CFLAGS += -DHWDEP_CAL_ENABLED diff --git a/post_proc/Android.mk b/post_proc/Android.mk index 1a8550c..b8aa9fc 100644 --- a/post_proc/Android.mk +++ b/post_proc/Android.mk @@ -1,4 +1,4 @@ -ifneq ($(filter msm8974 msm8226 msm8084 msm8992 msm8994 msm8996,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter msm8974 msm8226 msm8084 msm8992 msm8994,$(TARGET_BOARD_PLATFORM)),) LOCAL_PATH:= $(call my-dir) @@ -33,7 +33,7 @@ endif ################################################################################ -ifneq ($(filter msm8992 msm8994 msm8996,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter msm8992 msm8994,$(TARGET_BOARD_PLATFORM)),) include $(CLEAR_VARS) |