Android: fix build issues with Android Marshmallowipc-3.40-next3.40

pthread definitions are updated in Android M, update definitions
accordingly. Using PLATFORM_SDK_VERSION to determine versions < Android M

Android version numbers can be found here:
https://source.android.com/source/build-numbers.html#platform-code-names-versions-api-levels-and-ndk-releases

Signed-off-by: Vishal Mahaveer <vishalm@ti.com>

6 files changed, 11 insertions, 5 deletions

diff --git a/Android.mk b/Android.mk
index 3a44921..554173b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -39,6 +39,7 @@ LOCAL_C_INCLUDES +=  $(LOCAL_PATH)/linux/include \
                      $(LOCAL_PATH)/hlos_common/include
 
 LOCAL_CFLAGS += -DIPC_BUILDOS_ANDROID -DGATEMP_SUPPORT -fPIC
+LOCAL_CFLAGS += -DPLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
 LOCAL_MODULE_TAGS:= optional
 
 LOCAL_SRC_FILES:= linux/src/api/MultiProc.c \
@@ -65,6 +66,7 @@ LOCAL_C_INCLUDES +=  $(LOCAL_PATH)/linux/include \
                      $(LOCAL_PATH)/hlos_common/include
 
 LOCAL_CFLAGS += -DIPC_BUILDOS_ANDROID
+LOCAL_CFLAGS += -DPLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
 LOCAL_MODULE_TAGS:= optional
 
 LOCAL_SRC_FILES:= linux/src/utils/LAD_client.c \
@@ -87,6 +89,7 @@ LOCAL_C_INCLUDES +=  $(LOCAL_PATH)/linux/include \
                      $(LOCAL_PATH)/hlos_common/include
 
 LOCAL_CFLAGS += -DIPC_BUILDOS_ANDROID
+LOCAL_CFLAGS += -DPLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
 LOCAL_MODULE_TAGS:= optional
 
 LOCAL_SRC_FILES:= linux/src/utils/LAD_client.c \
@@ -110,6 +113,7 @@ LOCAL_C_INCLUDES +=  $(LOCAL_PATH)/linux/include \
                      $(LOCAL_PATH)/hlos_common/include
 
 LOCAL_CFLAGS += -DIPC_BUILDOS_ANDROID
+LOCAL_CFLAGS += -DPLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
 LOCAL_MODULE_TAGS:= optional
 
 LOCAL_SRC_FILES:= linux/src/transport/TransportRpmsg.c
@@ -128,6 +132,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH) \
                     $(LOCAL_PATH)/packages
 
 LOCAL_CFLAGS += -DIPC_BUILDOS_ANDROID
+LOCAL_CFLAGS += -DPLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
 LOCAL_MODULE_TAGS:= optional
 
 LOCAL_SRC_FILES:= packages/ti/ipc/mm/MmRpc.c
@@ -147,6 +152,7 @@ LOCAL_C_INCLUDES +=  $(LOCAL_PATH)/linux/include \
                      $(LOCAL_PATH)/hlos_common/include
 
 LOCAL_CFLAGS += -DIPC_BUILDOS_ANDROID -DGATEMP_SUPPORT
+LOCAL_CFLAGS += -DPLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
 LOCAL_MODULE_TAGS:= optional
 
 LOCAL_SRC_FILES:= linux/src/daemon/lad.c \
diff --git a/linux/src/api/Ipc.c b/linux/src/api/Ipc.c
index 44b4816..509d9a8 100644
--- a/linux/src/api/Ipc.c
+++ b/linux/src/api/Ipc.c
@@ -83,7 +83,7 @@ Void MessageQ_unbind(UInt16 procId);
  */
 static Ipc_Module Ipc_module = {
     .refCount           = 0,
-#if defined(IPC_BUILDOS_ANDROID)
+#if defined(IPC_BUILDOS_ANDROID) && (PLATFORM_SDK_VERSION < 23)
     .gate               = PTHREAD_RECURSIVE_MUTEX_INITIALIZER,
 #else
 // only _NP (non-portable) type available in CG tools which we're using
diff --git a/linux/src/api/MessageQ.c b/linux/src/api/MessageQ.c
index f82728d..2474e6f 100644
--- a/linux/src/api/MessageQ.c
+++ b/linux/src/api/MessageQ.c
@@ -156,7 +156,7 @@ static MessageQ_ModuleObject MessageQ_state =
 {
     .refCount   = 0,
     .nameServer = NULL,
-#if defined(IPC_BUILDOS_ANDROID)
+#if defined(IPC_BUILDOS_ANDROID) && (PLATFORM_SDK_VERSION < 23)
     .gate       = PTHREAD_RECURSIVE_MUTEX_INITIALIZER,
 #else
     .gate       = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP,
diff --git a/linux/src/daemon/MessageQ_daemon.c b/linux/src/daemon/MessageQ_daemon.c
index 15d6e76..280aa8a 100644
--- a/linux/src/daemon/MessageQ_daemon.c
+++ b/linux/src/daemon/MessageQ_daemon.c
@@ -143,7 +143,7 @@ static MessageQ_ModuleObject MessageQ_state =
     .queues                 = NULL,
     .numQueues              = 2u,
     .canFreeQueues          = FALSE,
-#if defined(IPC_BUILDOS_ANDROID)
+#if defined(IPC_BUILDOS_ANDROID) && (PLATFORM_SDK_VERSION < 23)
     .gate                   = PTHREAD_RECURSIVE_MUTEX_INITIALIZER,
 #else
     .gate                   = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP,
diff --git a/linux/src/daemon/NameServer_daemon.c b/linux/src/daemon/NameServer_daemon.c
index 279bf36..e296176 100644
--- a/linux/src/daemon/NameServer_daemon.c
+++ b/linux/src/daemon/NameServer_daemon.c
@@ -172,7 +172,7 @@ static NameServer_ModuleObject NameServer_state = {
     .defInstParams.checkExisting     = TRUE,
     .defInstParams.maxValueLen       = 0u,
     .defInstParams.maxNameLen        = 16u,
-#if defined(IPC_BUILDOS_ANDROID)
+#if defined(IPC_BUILDOS_ANDROID) && (PLATFORM_SDK_VERSION < 23)
     .modGate                         = PTHREAD_RECURSIVE_MUTEX_INITIALIZER,
 #else
 // only _NP (non-portable) type available in CG tools which we're using
diff --git a/linux/src/utils/LAD_client.c b/linux/src/utils/LAD_client.c
index a5c7e4c..3aafb67 100644
--- a/linux/src/utils/LAD_client.c
+++ b/linux/src/utils/LAD_client.c
@@ -68,7 +68,7 @@ static _LAD_ClientInfo clientInfo[LAD_MAXNUMCLIENTS];
 static LAD_Status initWrappers(Void);
 static Bool openCommandFIFO(Void);
 
-#if defined(IPC_BUILDOS_ANDROID)
+#if defined(IPC_BUILDOS_ANDROID) && (PLATFORM_SDK_VERSION < 23)
 static pthread_mutex_t modGate  = PTHREAD_RECURSIVE_MUTEX_INITIALIZER;
 #else
 // only _NP (non-portable) type available in CG tools which we're using