agm: Fix OSS compile for plugins
Change-Id: Ib8209387b12f6a9f8f9a56d44351e2bf3d84bec4
diff --git a/plugins/tinyalsa/Android.mk b/plugins/tinyalsa/Android.mk
index 7c422fd..e348dc6 100644
--- a/plugins/tinyalsa/Android.mk
+++ b/plugins/tinyalsa/Android.mk
@@ -21,6 +21,8 @@
libcutils \
liblog
+LOCAL_CFLAGS += -Wno-format -Wno-incompatible-pointer-types
+
#if android version is R, refer to qtitinyxx otherwise use upstream ones
#This assumes we would be using AR code only for Android R and subsequent versions.
ifneq ($(filter 11 R, $(PLATFORM_VERSION)),)
@@ -60,6 +62,8 @@
libutils \
liblog
+LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-variable
+
#if android version is R, refer to qtitinyxx otherwise use upstream ones
#This assumes we would be using AR code only for Android R and subsequent versions.
ifneq ($(filter 11 R, $(PLATFORM_VERSION)),)
@@ -103,6 +107,8 @@
libcutils \
liblog
+LOCAL_CFLAGS += -Wno-format -Wno-unused-parameter -Wno-unused-variable -Wno-unused-function
+
# Use flag based selection to use QTI vs open source tinycompress project
ifeq ($(TARGET_USES_QTI_TINYCOMPRESS),true)
diff --git a/plugins/tinyalsa/src/agm_pcm_plugin.c b/plugins/tinyalsa/src/agm_pcm_plugin.c
index 92561fc..2099b60 100644
--- a/plugins/tinyalsa/src/agm_pcm_plugin.c
+++ b/plugins/tinyalsa/src/agm_pcm_plugin.c
@@ -39,6 +39,7 @@
#include <stdint.h>
#include <stdlib.h>
#include <strings.h>
+#include <string.h>
#include <stdio.h>
#include <unistd.h>
#include <tinyalsa/pcm_plugin.h>
diff --git a/plugins/tinyalsa/test/Android.mk b/plugins/tinyalsa/test/Android.mk
index 8db0db3..67c90f2 100644
--- a/plugins/tinyalsa/test/Android.mk
+++ b/plugins/tinyalsa/test/Android.mk
@@ -7,10 +7,12 @@
LOCAL_VENDOR_MODULE := true
LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-result
+LOCAL_CFLAGS += -Wno-unused-variable
LOCAL_SRC_FILES := agmmixer.c
LOCAL_HEADER_LIBRARIES := \
libagm_headers \
+ libarpal_headers \
libacdb_headers
#if android version is R, refer to qtitinyxx otherwise use upstream ones
@@ -37,11 +39,13 @@
LOCAL_VENDOR_MODULE := true
LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-result
+LOCAL_CFLAGS += -Wno-unused-variable -Wno-format-insufficient-args
LOCAL_CFLAGS += -DBACKEND_CONF_FILE=\"/vendor/etc/backend_conf.xml\"
LOCAL_SRC_FILES := agmplay.c
LOCAL_HEADER_LIBRARIES := \
libagm_headers \
+ libarpal_headers \
libacdb_headers
#if android version is R, refer to qtitinyxx otherwise use upstream ones
@@ -65,11 +69,13 @@
LOCAL_VENDOR_MODULE := true
LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-result
+LOCAL_CFLAGS += -Wno-format-insufficient-args
LOCAL_CFLAGS += -DBACKEND_CONF_FILE=\"/vendor/etc/backend_conf.xml\"
LOCAL_SRC_FILES := agmcap.c
LOCAL_HEADER_LIBRARIES := \
libagm_headers \
+ libarpal_headers \
libacdb_headers
#if android version is R, refer to qtitinyxx otherwise use upstream ones
@@ -99,6 +105,7 @@
LOCAL_HEADER_LIBRARIES := \
libagm_headers \
+ libarpal_headers \
libacdb_headers
#if android version is R, refer to qtitinyxx otherwise use upstream ones
@@ -123,6 +130,7 @@
LOCAL_VENDOR_MODULE := true
LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-result
+LOCAL_CFLAGS += -Wno-unused-variable
LOCAL_CFLAGS += -DBACKEND_CONF_FILE=\"/vendor/etc/backend_conf.xml\"
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
@@ -132,6 +140,7 @@
LOCAL_HEADER_LIBRARIES := \
libagm_headers \
+ libarpal_headers \
libacdb_headers
# Use flag based selection to use QTI vs open source tinycompress project
@@ -169,6 +178,7 @@
LOCAL_HEADER_LIBRARIES := \
libagm_headers \
+ libarpal_headers \
libacdb_headers
# Use flag based selection to use QTI vs open source tinycompress project
@@ -197,11 +207,14 @@
LOCAL_VENDOR_MODULE := true
LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-result
+LOCAL_CFLAGS += -Wno-unused-variable -Wno-pointer-sign -Wno-varargs
+LOCAL_CFLAGS += -Wno-incompatible-function-pointer-types
LOCAL_CFLAGS += -DBACKEND_CONF_FILE=\"/vendor/etc/backend_conf.xml\"
LOCAL_SRC_FILES := agm_voiceui.c
LOCAL_HEADER_LIBRARIES := \
libagm_headers \
+ libarpal_headers \
libacdb_headers
#if android version is R, refer to qtitinyxx otherwise use upstream ones
diff --git a/service/Android.mk b/service/Android.mk
index d88ab3f..28d20f7 100644
--- a/service/Android.mk
+++ b/service/Android.mk
@@ -42,6 +42,7 @@
src/device_hw_ep.c
LOCAL_HEADER_LIBRARIES := \
+ libarpal_headers \
libspf-headers \
libutils_headers \
libacdb_headers