diff options
| author | jinamdar <jaydeep.inamdar@dts.com> | 2015-12-09 12:38:43 -0800 |
|---|---|---|
| committer | Matt Wagantall <mwagantall@cyngn.com> | 2016-02-01 16:41:33 -0800 |
| commit | 96985edf1dd51dcf4a3bebbb2f7f2169bc619497 (patch) | |
| tree | 831076e8e506af7ebbd89f83f8a6ce6ded8c1ac5 /services/audioflinger/Android.mk | |
| parent | 554bc677837d05f5052592044f77e4de78520a04 (diff) | |
| download | frameworks_av-96985edf1dd51dcf4a3bebbb2f7f2169bc619497.zip frameworks_av-96985edf1dd51dcf4a3bebbb2f7f2169bc619497.tar.gz frameworks_av-96985edf1dd51dcf4a3bebbb2f7f2169bc619497.tar.bz2 | |
Combine 'DTS Sound (TruMedia) Postpro support in frameworks/av for Android 6.0' as a single patch.
Signed-off-by: jinamdar <jaydeep.inamdar@dts.com>
(cherry picked from commit d3668da66643d4cc39058fb65c8db0742748f70f)
Conflicts:
services/audioflinger/AudioFlinger.cpp
services/audioflinger/Threads.cpp
Change-Id: I67e3ba100ff40058919ba827b806aea7bdbaf4bb
Diffstat (limited to 'services/audioflinger/Android.mk')
| -rw-r--r-- | services/audioflinger/Android.mk | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk index 474fb46..0dd2af6 100644 --- a/services/audioflinger/Android.mk +++ b/services/audioflinger/Android.mk @@ -1,3 +1,23 @@ +# +# This file was modified by DTS, Inc. The portions of the +# code that are surrounded by "DTS..." are copyrighted and +# licensed separately, as follows: +# +# (C) 2015 DTS, Inc. +# +# 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. +# + LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -86,6 +106,11 @@ LOCAL_SRC_FILES += \ LOCAL_CFLAGS += -DSTATE_QUEUE_INSTANTIATIONS='"StateQueueInstantiations.cpp"' LOCAL_CFLAGS += -fvisibility=hidden +ifeq ($(strip $(BOARD_USES_SRS_TRUEMEDIA)),true) +LOCAL_SHARED_LIBRARIES += libsrsprocessing +LOCAL_CFLAGS += -DSRS_PROCESSING +LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/audio-effects +endif include $(BUILD_SHARED_LIBRARY) |