diff options
| author | Dorian Snyder <dastin1015@gmail.com> | 2014-08-14 11:08:11 -0700 |
|---|---|---|
| committer | Dorian Snyder <dastin1015@gmail.com> | 2014-08-14 18:10:18 +0000 |
| commit | 270d3be0a56731df79ad816ada5e27a853b9d858 (patch) | |
| tree | 0de106fdf20520919e5ff4c8a6ea1cb7a969e702 | |
| parent | 64bc8af31f5faf7b8a81131ad3eeaae08e5bafff (diff) | |
| download | device_samsung_galaxys2-common-270d3be0a56731df79ad816ada5e27a853b9d858.zip device_samsung_galaxys2-common-270d3be0a56731df79ad816ada5e27a853b9d858.tar.gz device_samsung_galaxys2-common-270d3be0a56731df79ad816ada5e27a853b9d858.tar.bz2 | |
galaxys2-common: cleanup tinyalsa audio flag inheritance
also allow r760 to access files
Change-Id: Icd116d6dd47158dd1f61fc8e2b7bd268e1a77210
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | tinyalsa_audio/Android.mk | 20 |
2 files changed, 2 insertions, 20 deletions
@@ -14,7 +14,7 @@ # limitations under the License. # -ifneq ($(filter i777 i9100 n7000 d710,$(TARGET_DEVICE)),) +ifneq ($(filter d710 i777 i9100 n7000 r760,$(TARGET_DEVICE)),) LOCAL_PATH := $(call my-dir) include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/tinyalsa_audio/Android.mk b/tinyalsa_audio/Android.mk index 8675bfb..55b4bda 100644 --- a/tinyalsa_audio/Android.mk +++ b/tinyalsa_audio/Android.mk @@ -43,27 +43,9 @@ LOCAL_SHARED_LIBRARIES := \ libdl ifeq ($(strip $(BOARD_USE_YAMAHA_MC1N2_AUDIO)),true) - LOCAL_CFLAGS += -DYAMAHA_MC1N2_AUDIO + LOCAL_CFLAGS += -DYAMAHA_MC1N2_AUDIO -DYAMAHA_MC1N2_AUDIO_DEVICE=\"galaxys2\" LOCAL_C_INCLUDES += $(LOCAL_PATH)/../yamaha-mc1n2-audio/include LOCAL_SHARED_LIBRARIES += libyamaha-mc1n2-audio - -#this really needs to get cleaned up to properly inherit from -common - ifeq ($(TARGET_DEVICE),n7000) - LOCAL_CFLAGS += -DYAMAHA_MC1N2_AUDIO_DEVICE=\"galaxys2\" - endif - - ifeq ($(TARGET_DEVICE),i9100) - LOCAL_CFLAGS += -DYAMAHA_MC1N2_AUDIO_DEVICE=\"galaxys2\" - endif - - ifeq ($(TARGET_DEVICE),i777) - LOCAL_CFLAGS += -DYAMAHA_MC1N2_AUDIO_DEVICE=\"galaxys2\" - endif - - ifeq ($(TARGET_DEVICE),d710) - LOCAL_CFLAGS += -DYAMAHA_MC1N2_AUDIO_DEVICE=\"galaxys2\" - endif - endif LOCAL_PRELINK_MODULE := false |