Merge "Use audio_session_t consistently" into nyc-dev

[android-x86/hardware-libhardware_legacy.git] / audio / Android.mk

diff --git a/audio/Android.mk b/audio/Android.mk
index 58f03c3..b3040d7 100644 (file)
--- a/audio/Android.mk
+++ b/audio/Android.mk
@@ -11,8 +11,10 @@ LOCAL_SRC_FILES := \
     audio_hw_hal.cpp
 
 LOCAL_MODULE := libaudiohw_legacy
-LOCAL_MODULE_TAGS := optional
 LOCAL_STATIC_LIBRARIES := libmedia_helper
+LOCAL_CFLAGS := -Wno-unused-parameter -Wno-gnu-designator
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -29,7 +31,9 @@ endif
 
 LOCAL_STATIC_LIBRARIES := libmedia_helper
 LOCAL_MODULE := libaudiopolicy_legacy
-LOCAL_MODULE_TAGS := optional
+LOCAL_CFLAGS += -Wno-unused-parameter
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -43,7 +47,7 @@ LOCAL_SRC_FILES := \
 LOCAL_SHARED_LIBRARIES := \
     libcutils \
     libutils \
-    libmedia
+    liblog
 
 LOCAL_STATIC_LIBRARIES := \
     libmedia_helper
@@ -52,8 +56,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
     libaudiopolicy_legacy
 
 LOCAL_MODULE := audio_policy.default
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_CFLAGS := -Wno-unused-parameter
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include
 
 include $(BUILD_SHARED_LIBRARY)