ags: Fix build

Signed-off-by: Abhay Singh Gill <[email protected]>
Neoteric-OS · Jul 5, 2024 · 7dbbd8c · 7dbbd8c
1 parent a72f3db
commit 7dbbd8c
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 11 deletions.
diff --git a/acdb/Android.mk b/acdb/Android.mk
@@ -79,6 +79,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/ats/fts/common/inc/ \
     $(LOCAL_PATH)/ats/transports/diag/linux/actp/inc/ \
     $(LOCAL_PATH)/ats/transports/diag/linux/audtp/inc/ \
+    $(LOCAL_PATH)/ats/transports/diag/linux/inc/ \
     $(LOCAL_PATH)/ats/adie/common/inc \
     $(LOCAL_PATH)/ats/adie/common/api \
     $(LOCAL_PATH)/ats/api \
@@ -106,8 +107,6 @@ LOCAL_SRC_FILES := \
     ats/transports/tcpip_server/src/tcpip_rtm_server.cpp \
     ats/transports/tcpip_server/src/tcpip_socket_util.cpp
 
-LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/diag/include
-
 LOCAL_MODULE := libats
 LOCAL_MODULE_OWNER := qti
 LOCAL_MODULE_TAGS := optional
@@ -116,15 +115,14 @@ LOCAL_PROPRIETARY_MODULE := true
 LOCAL_HEADER_LIBRARIES := \
     libcutils_headers \
     libutils_headers \
-    libdiag_headers \
     vendor_common_inc
 
 LOCAL_SHARED_LIBRARIES := \
     liblx-osal\
     libutils\
     libcutils \
     libdiag \
-    libar-gsl\
+    libar-gsl \
     libar-acdb
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/ats/api
@@ -173,4 +171,4 @@ LOCAL_SHARED_LIBRARIES := \
 
 LOCAL_LDLIBS := -llog
 
-include $(BUILD_EXECUTABLE)
+include $(BUILD_EXECUTABLE)
diff --git a/acdb/ats/transports/diag/linux/audtp/inc/comdef.h b/acdb/ats/transports/diag/linux/audtp/inc/comdef.h
@@ -0,0 +1,15 @@
+/**
+ * \file comdef.h
+ * \brief
+ *  	 for compatibility with diag
+ *
+ * \copyright
+ *    Copyright (c) Qualcomm Innovation Center, Inc. All Rights Reserved.
+ *    SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef COMDEF_H
+#define PACK(__Declaration__) __Declaration__ __attribute__((__packed__))
+#define word uint32_t
+#define COMDEF_H
+#endif
diff --git a/ar_osal/Android.mk b/ar_osal/Android.mk
@@ -28,7 +28,6 @@ LOCAL_CFLAGS := $(osal-def)
 LOCAL_HEADER_LIBRARIES += audio_kernel_headers
 LOCAL_HEADER_LIBRARIES += libarosal_headers
 LOCAL_HEADER_LIBRARIES += qti_audio_kernel_uapi
-LOCAL_HEADER_LIBRARIES += libdiag_headers
 LOCAL_EXPORT_HEADER_LIBRARY_HEADERS := libarosal_headers
 
 include $(LIBION_HEADER_PATH_WRAPPER)
@@ -60,8 +59,7 @@ else
 LOCAL_SRC_FILES += src/linux/qcom/ar_osal_shmem_db.c
 endif
 
-LOCAL_SHARED_LIBRARIES := liblog \
-                          libdiag
+LOCAL_SHARED_LIBRARIES := liblog
 
 LOCAL_MODULE := liblx-osal
 LOCAL_MODULE_OWNER := qti

diff --git a/ar_osal/api/comdef.h b/ar_osal/api/comdef.h
@@ -0,0 +1,15 @@
+/**
+ * \file comdef.h
+ * \brief
+ *  	 for compatibility with diag
+ *
+ * \copyright
+ *    Copyright (c) Qualcomm Innovation Center, Inc. All Rights Reserved.
+ *    SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef COMDEF_H
+#define PACK(__Declaration__) __Declaration__ __attribute__((__packed__))
+#define word uint32_t
+#define COMDEF_H
+#endif
diff --git a/ar_osal/src/linux/qcom/ar_osal_servreg.c b/ar_osal/src/linux/qcom/ar_osal_servreg.c
@@ -25,6 +25,7 @@
 #ifdef AR_OSAL_USE_CUTILS
 #include <cutils/properties.h>
 #endif
+#include <errno.h>
 
  #ifdef __cplusplus
  extern "C" {
@@ -339,12 +340,12 @@ ar_osal_servreg_t ar_osal_servreg_register(_In_ ar_osal_client_type  client_type
     _In_ ar_osal_servreg_entry_type *domain,
     _In_ ar_osal_servreg_entry_type *service)
 {
-#ifndef AR_OSAL_USE_PD_NOTIFIER
-    return 1;
-#else
     int32_t status = AR_EOK;
     //ar_osal_servreg_t* handle = NULL;
     ar_osal_service_node* srv_reg_handle = NULL;
+#ifndef AR_OSAL_USE_PD_NOTIFIER
+    return (ar_osal_servreg_t)srv_reg_handle;
+#else
     enum pd_rcode pd_rc = PD_NOTIFIER_FAIL;
     pd_state state = SERVREG_NOTIF_SERVICE_STATE_DOWN_V01;