qcom-audio: Fixes for VNDK_VERSION=current

Change-Id: Ibbf23da202fc1427061bdcc2dfa0ce33c557c155

16 files changed, 29 insertions, 7 deletions

diff --git a/hal/audio_extn/audio_extn.c b/hal/audio_extn/audio_extn.c
index 7f2185fd..42ef5444 100644
--- a/hal/audio_extn/audio_extn.c
+++ b/hal/audio_extn/audio_extn.c
@@ -43,8 +43,9 @@
 #include <errno.h>
 #include <dlfcn.h>
 #include <fcntl.h>
+#include <unistd.h>
 #include <cutils/properties.h>
-#include <cutils/log.h>
+#include <log/log.h>
 
 #include "audio_hw.h"
 #include "audio_extn.h"
diff --git a/hal/audio_extn/fm.c b/hal/audio_extn/fm.c
index b34bb220..8b0ee9b3 100644
--- a/hal/audio_extn/fm.c
+++ b/hal/audio_extn/fm.c
@@ -23,13 +23,14 @@
 
 #include <errno.h>
 #include <math.h>
-#include <cutils/log.h>
+#include <log/log.h>
 
 #include "audio_hw.h"
 #include "platform.h"
 #include "platform_api.h"
 #include <stdlib.h>
 #include <cutils/str_parms.h>
+#include <unistd.h>
 
 #ifdef DYNAMIC_LOG_ENABLED
 #include <log_xml_parser.h>
diff --git a/hal/audio_extn/gef.c b/hal/audio_extn/gef.c
index 3d449627..2533ede0 100644
--- a/hal/audio_extn/gef.c
+++ b/hal/audio_extn/gef.c
@@ -33,7 +33,7 @@
 
 #include <errno.h>
 #include <math.h>
-#include <cutils/log.h>
+#include <log/log.h>
 #include <fcntl.h>
 #include <dirent.h>
 #include "audio_hw.h"
@@ -46,6 +46,8 @@
 #include <cutils/properties.h>
 #include "audio_extn.h"
 #include "audio_hw.h"
+#include <unistd.h>
+#include <pthread.h>
 
 #ifdef DYNAMIC_LOG_ENABLED
 #include <log_xml_parser.h>
diff --git a/hal/audio_extn/passthru.c b/hal/audio_extn/passthru.c
index 48ef8039..5d8019b9 100644
--- a/hal/audio_extn/passthru.c
+++ b/hal/audio_extn/passthru.c
@@ -32,12 +32,14 @@
 #include <stdlib.h>
 #include <cutils/atomic.h>
 #include <cutils/str_parms.h>
-#include <cutils/log.h>
+#include <log/log.h>
 #include "audio_hw.h"
 #include "audio_extn.h"
 #include "platform_api.h"
 #include <platform.h>
 #include <cutils/properties.h>
+#include <unistd.h>
+#include <pthread.h>
 
 #include "sound/compress_params.h"
 
diff --git a/hal/audio_extn/spkr_protection.c b/hal/audio_extn/spkr_protection.c
index b1bb5569..b057762e 100644
--- a/hal/audio_extn/spkr_protection.c
+++ b/hal/audio_extn/spkr_protection.c
@@ -33,7 +33,7 @@
 
 #include <errno.h>
 #include <math.h>
-#include <cutils/log.h>
+#include <log/log.h>
 #include <fcntl.h>
 #include <dirent.h>
 #include "audio_hw.h"
@@ -46,6 +46,8 @@
 #include <cutils/properties.h>
 #include "audio_extn.h"
 #include <linux/msm_audio_calibration.h>
+#include <unistd.h>
+#include <pthread.h>
 
 #ifdef DYNAMIC_LOG_ENABLED
 #include <log_xml_parser.h>
diff --git a/hal/audio_hw_extn_api.c b/hal/audio_hw_extn_api.c
index 09d83f43..be30f79a 100644
--- a/hal/audio_hw_extn_api.c
+++ b/hal/audio_hw_extn_api.c
@@ -33,6 +33,7 @@
 
 #include <inttypes.h>
 #include <errno.h>
+#include <pthread.h>
 #include <cutils/log.h>
 
 #include <hardware/audio.h>
diff --git a/mm-audio/aenc-aac/qdsp6/src/aenc_svr.c b/mm-audio/aenc-aac/qdsp6/src/aenc_svr.c
index 53e371ed..d28e86bb 100644
--- a/mm-audio/aenc-aac/qdsp6/src/aenc_svr.c
+++ b/mm-audio/aenc-aac/qdsp6/src/aenc_svr.c
@@ -31,6 +31,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <fcntl.h>
 #include <errno.h>
+#include <unistd.h>
 
 #include <aenc_svr.h>
 
diff --git a/mm-audio/aenc-amrnb/qdsp6/src/aenc_svr.c b/mm-audio/aenc-amrnb/qdsp6/src/aenc_svr.c
index f283c327..cd8ae14b 100644
--- a/mm-audio/aenc-amrnb/qdsp6/src/aenc_svr.c
+++ b/mm-audio/aenc-amrnb/qdsp6/src/aenc_svr.c
@@ -31,6 +31,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <fcntl.h>
 #include <errno.h>
+#include <unistd.h>
 
 #include <aenc_svr.h>
 
diff --git a/mm-audio/aenc-evrc/qdsp6/src/aenc_svr.c b/mm-audio/aenc-evrc/qdsp6/src/aenc_svr.c
index feda0a5c..8f6ea988 100644
--- a/mm-audio/aenc-evrc/qdsp6/src/aenc_svr.c
+++ b/mm-audio/aenc-evrc/qdsp6/src/aenc_svr.c
@@ -31,6 +31,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <fcntl.h>
 #include <errno.h>
+#include <unistd.h>
 
 #include <aenc_svr.h>
 
diff --git a/mm-audio/aenc-g711/qdsp6/src/aenc_svr.c b/mm-audio/aenc-g711/qdsp6/src/aenc_svr.c
index fa446320..d7e3dafe 100644
--- a/mm-audio/aenc-g711/qdsp6/src/aenc_svr.c
+++ b/mm-audio/aenc-g711/qdsp6/src/aenc_svr.c
@@ -32,6 +32,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <fcntl.h>
 #include <errno.h>
+#include <unistd.h>
 
 #include <aenc_svr.h>
 
diff --git a/mm-audio/aenc-qcelp13/qdsp6/src/aenc_svr.c b/mm-audio/aenc-qcelp13/qdsp6/src/aenc_svr.c
index 6304918e..459723ec 100644
--- a/mm-audio/aenc-qcelp13/qdsp6/src/aenc_svr.c
+++ b/mm-audio/aenc-qcelp13/qdsp6/src/aenc_svr.c
@@ -29,6 +29,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <stdlib.h>
 #include <string.h>
 
+#include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 
diff --git a/post_proc/asphere.c b/post_proc/asphere.c
index 885e85b6..99e8325b 100644
--- a/post_proc/asphere.c
+++ b/post_proc/asphere.c
@@ -31,6 +31,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <pthread.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdbool.h>
diff --git a/post_proc/bundle.c b/post_proc/bundle.c
index 7c3f1ef7..e002b222 100644
--- a/post_proc/bundle.c
+++ b/post_proc/bundle.c
@@ -40,6 +40,7 @@
 
 #include <pthread.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 #include <cutils/list.h>
 #include <cutils/log.h>
diff --git a/post_proc/effect_api.c b/post_proc/effect_api.c
index b20857d4..2d788cd6 100644
--- a/post_proc/effect_api.c
+++ b/post_proc/effect_api.c
@@ -57,7 +57,8 @@
 #include <stdio.h>
 #include <stdbool.h>
 #include <errno.h>
-#include <cutils/log.h>
+#include <sys/ioctl.h>
+#include <log/log.h>
 #include <tinyalsa/asoundlib.h>
 #include <sound/audio_effects.h>
 #include <sound/devdep_params.h>
diff --git a/post_proc/effect_util.c b/post_proc/effect_util.c
index 22780f75..d69df073 100644
--- a/post_proc/effect_util.c
+++ b/post_proc/effect_util.c
@@ -14,11 +14,15 @@
  * limitations under the License.
  */
 
-#include <utils/Log.h>
+#include <log/log.h>
 #include <stdlib.h>
 #include <string.h>
 #include "effect_util.h"
 #include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#include <linux/limits.h>
 
 #ifdef LOG_TAG
 #undef LOG_TAG
diff --git a/qahw_api/Android.mk b/qahw_api/Android.mk
index ee06a30f..3faaa952 100644
--- a/qahw_api/Android.mk
+++ b/qahw_api/Android.mk
@@ -35,6 +35,7 @@ LOCAL_COPY_HEADERS      += inc/qahw_effect_virtualizer.h
 LOCAL_COPY_HEADERS      += inc/qahw_effect_visualizer.h
 
 LOCAL_PRELINK_MODULE    := false
+LOCAL_VENDOR_MODULE     := true
 
 include $(BUILD_SHARED_LIBRARY)