commit f1d64a87246fb0a4e39017489ef0a0f26ae6efc4
author Niranjan Yadla <nyadla@cadence.com> Wed Sep 19 10:30:49 2018 -0700
committer Alistair Strachan <astrachan@google.com> Thu Sep 20 12:28:37 2018 -0700
tree 1f3297b9dc48a86cb13a630340b553e2d9cd2ca7
parent e113eccfd1c28e8b3ca1f969ec3cde1282576bd1

hikey960: Audio DSP changes in prep for Treble

This patch provides hifi changes that are needed to work with
FULL_TREBLE enabled.

As /system/bin does not support write permissions moved dec-out.pcm
file to /data/dec-out.pcm

Copied dhifimesg to /vendor/bin in order to capture hifi dsp logs

Bug: 116226155
Change-Id: Ia90f09760198b3fefe5ef3dfbdf5d7e11dd67a4b
Originally-by: Niranjan Yadla <nyadla@cadence.com>
Signed-off-by: Alistair Strachan <astrachan@google.com>

hifi/xaf/host-apf/Android.mk

diff --git a/hifi/xaf/host-apf/Android.mk b/hifi/xaf/host-apf/Android.mk
index 28e7101..2bce8cf 100644
--- a/hifi/xaf/host-apf/Android.mk
+++ b/hifi/xaf/host-apf/Android.mk
@@ -4,6 +4,7 @@
 ################################################################################
 
 include $(CLEAR_VARS)
+LOCAL_VENDOR_MODULE := true
 common_C_INCLUDES := 	\
         $(LOCAL_PATH)/include	\
         $(LOCAL_PATH)/include/audio		\
@@ -25,7 +26,9 @@
 
 C_FLAGS := -DXF_TRACE=0 -Wall -Werror -Wno-everything
 
+LOCAL_SHARED_LIBRARIES := liblog
 LOCAL_C_INCLUDES := $(common_C_INCLUDES)
+LOCAL_C_INCLUDES += external/expat/lib
 LOCAL_CFLAGS := $(C_FLAGS)
 LOCAL_MODULE := libxtensa_proxy
 LOCAL_MODULE_TAGS := optional
@@ -36,6 +39,7 @@
 # xaf-dec-test: fileinput->ogg/pcm decoder->speaker output
 ################################################################################
 include $(CLEAR_VARS)
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE := xaf-dec-test
 
 LOCAL_SRC_FILES := \
@@ -52,6 +56,7 @@
 # xaf-dec-mix-test: fileinput->ogg orpcm decoder->Mixer->speaker output
 ################################################################################
 include $(CLEAR_VARS)
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE := xaf-dec-mix-test
 
 LOCAL_SRC_FILES := \

hifi/xaf/host-apf/include/os/android/xf-osal.h

diff --git a/hifi/xaf/host-apf/include/os/android/xf-osal.h b/hifi/xaf/host-apf/include/os/android/xf-osal.h
index 7d2f5a9..6286405 100644
--- a/hifi/xaf/host-apf/include/os/android/xf-osal.h
+++ b/hifi/xaf/host-apf/include/os/android/xf-osal.h
@@ -34,7 +34,7 @@
 #include <sys/mman.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
-#include <cutils/log.h>
+#include <log/log.h>
 
 /*******************************************************************************
  * Tracing primitive

hifi/xaf/host-apf/utest/xaf-dec-test.c

diff --git a/hifi/xaf/host-apf/utest/xaf-dec-test.c b/hifi/xaf/host-apf/utest/xaf-dec-test.c
index 7e5d050..b83a0f9 100644
--- a/hifi/xaf/host-apf/utest/xaf-dec-test.c
+++ b/hifi/xaf/host-apf/utest/xaf-dec-test.c
@@ -253,9 +253,9 @@
        TRACE(ERROR, _x("Failed to open '%s': %d"), argv[1], errno);
        exit(-1);
     }
-    if ((ofp = fopen("dec-out.pcm", "wb")) == NULL)
+    if ((ofp = fopen("/data/dec-out.pcm", "wb")) == NULL)
     {
-       TRACE(ERROR, _x("Failed to open '%s': %d"), "dec-out.pcm", errno);
+       TRACE(ERROR, _x("Failed to open '%s': %d"), "/data/dec-out.pcm", errno);
        exit(-1);
     }
     p_input  = fp;