ADHOC/replicant-device_samsung_galaxys2-common
3
0
Fork 0
Code Issues Releases Activity

galaxys2-common: cleanup tinyalsa audio flag inheritance

Browse Source 
also allow r760 to access files

Change-Id: Icd116d6dd47158dd1f61fc8e2b7bd268e1a77210
This commit is contained in:
Dorian Snyder 2014-08-14 11:08:11 -07:00
parent 64bc8af31f
commit 270d3be0a5
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Android.mk
View File

@ -14,7 +14,7 @@
# limitations under the License. # 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) LOCAL_PATH := $(call my-dir)
include $(call all-makefiles-under,$(LOCAL_PATH)) include $(call all-makefiles-under,$(LOCAL_PATH))

20
tinyalsa_audio/Android.mk
View File

@ -43,27 +43,9 @@ LOCAL_SHARED_LIBRARIES := \
libdl libdl
ifeq ($(strip $(BOARD_USE_YAMAHA_MC1N2_AUDIO)),true) 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_C_INCLUDES += $(LOCAL_PATH)/../yamaha-mc1n2-audio/include
LOCAL_SHARED_LIBRARIES += libyamaha-mc1n2-audio 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 endif
LOCAL_PRELINK_MODULE := false LOCAL_PRELINK_MODULE := false