Use libmedia header paths in legacy audio libs

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

diff --git a/audio/Android.mk b/audio/Android.mk
index a69b9cd..d9d2d6a 100644 (file)
--- a/audio/Android.mk
+++ b/audio/Android.mk
@@ -11,8 +11,11 @@ LOCAL_SRC_FILES := \
     audio_hw_hal.cpp
 
 LOCAL_MODULE := libaudiohw_legacy
-LOCAL_MODULE_TAGS := optional
+LOCAL_SHARED_LIBRARIES := libmedia
 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)
 
@@ -27,9 +30,12 @@ ifeq ($(AUDIO_POLICY_TEST),true)
   LOCAL_CFLAGS += -DAUDIO_POLICY_TEST
 endif
 
+LOCAL_SHARED_LIBRARIES := libmedia
 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)
 
@@ -42,7 +48,9 @@ LOCAL_SRC_FILES := \
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \
-    libutils
+    libmedia \
+    libutils \
+    liblog
 
 LOCAL_STATIC_LIBRARIES := \
     libmedia_helper
@@ -51,8 +59,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)