From 270d3be0a56731df79ad816ada5e27a853b9d858 Mon Sep 17 00:00:00 2001
From: Dorian Snyder <dastin1015@gmail.com>
Date: Thu, 14 Aug 2014 11:08:11 -0700
Subject: galaxys2-common: cleanup tinyalsa audio flag inheritance

also allow r760 to access files

Change-Id: Icd116d6dd47158dd1f61fc8e2b7bd268e1a77210
---
 Android.mk                |  2 +-
 tinyalsa_audio/Android.mk | 20 +-------------------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/Android.mk b/Android.mk
index 2bd8c10..a98a79c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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
-- 
cgit v1.1