Android: Adds GateMP build support

The necessary build files have been updated to add GateMP for
Android.  The functionality has been verified manually using
breakpoints to ensure GateMP APIs are behaving as expected.

diff --git a/android/src/api/Android.mk b/android/src/api/Android.mk
index b14d8360579cd292f34d7834ebeeffd1c8c48ed2..2378ac372356054a47d019a7396a828da7ed46ea 100644 (file)
--- a/android/src/api/Android.mk
+++ b/android/src/api/Android.mk
@@ -1,5 +1,5 @@
 #
 #

-#   Copyright (c) 2013, Texas Instruments Incorporated
+#   Copyright (c) 2013-2014, Texas Instruments Incorporated

 #
 #   Redistribution and use in source and binary forms, with or without
 #   modification, are permitted provided that the following conditions
 #
 #   Redistribution and use in source and binary forms, with or without
 #   modification, are permitted provided that the following conditions


@@ -39,13 +39,16 @@ LOCAL_C_INCLUDES +=  $(LOCAL_PATH)/$(IPC_ROOT)/linux/include \
                      $(LOCAL_PATH)/$(IPC_ROOT)/packages \
                      $(LOCAL_PATH)/$(IPC_ROOT)/hlos_common/include
 
                      $(LOCAL_PATH)/$(IPC_ROOT)/packages \
                      $(LOCAL_PATH)/$(IPC_ROOT)/hlos_common/include
 

-LOCAL_CFLAGS += -DIPC_BUILDOS_ANDROID
+LOCAL_CFLAGS += -DIPC_BUILDOS_ANDROID -DGATEMP_SUPPORT

 LOCAL_MODULE_TAGS:= optional
 
 LOCAL_SRC_FILES:= $(IPC_ROOT)/linux/src/api/MultiProc.c \
                   $(IPC_ROOT)/linux/src/api/NameServer.c \
                   $(IPC_ROOT)/linux/src/api/Ipc.c \
 LOCAL_MODULE_TAGS:= optional
 
 LOCAL_SRC_FILES:= $(IPC_ROOT)/linux/src/api/MultiProc.c \
                   $(IPC_ROOT)/linux/src/api/NameServer.c \
                   $(IPC_ROOT)/linux/src/api/Ipc.c \

-                  $(IPC_ROOT)/linux/src/api/MessageQ.c
+                  $(IPC_ROOT)/linux/src/api/MessageQ.c \
+                  $(IPC_ROOT)/linux/src/api/gates/GateMP.c \
+                  $(IPC_ROOT)/linux/src/api/gates/GateMutex.c \
+                  $(IPC_ROOT)/linux/src/api/gates/GateHWSpinlock.c

 
 LOCAL_SHARED_LIBRARIES := \
     liblog libtiipcutils
 
 LOCAL_SHARED_LIBRARIES := \
     liblog libtiipcutils

diff --git a/android/src/daemon/Android.mk b/android/src/daemon/Android.mk
index 595f5e404068fe1a5b46efef115ec4fc46288422..0374812e8206c4cf17f34e7ed3afa01dc5c44017 100644 (file)
--- a/android/src/daemon/Android.mk
+++ b/android/src/daemon/Android.mk
@@ -1,5 +1,5 @@
 #
 #

-#   Copyright (c) 2013, Texas Instruments Incorporated
+#   Copyright (c) 2013-2014, Texas Instruments Incorporated

 #
 #   Redistribution and use in source and binary forms, with or without
 #   modification, are permitted provided that the following conditions
 #
 #   Redistribution and use in source and binary forms, with or without
 #   modification, are permitted provided that the following conditions


@@ -39,14 +39,19 @@ LOCAL_C_INCLUDES +=  $(LOCAL_PATH)/$(IPC_ROOT)/linux/include \
                      $(LOCAL_PATH)/$(IPC_ROOT)/packages \
                      $(LOCAL_PATH)/$(IPC_ROOT)/hlos_common/include
 
                      $(LOCAL_PATH)/$(IPC_ROOT)/packages \
                      $(LOCAL_PATH)/$(IPC_ROOT)/hlos_common/include
 

-LOCAL_CFLAGS += -DIPC_BUILDOS_ANDROID
+LOCAL_CFLAGS += -DIPC_BUILDOS_ANDROID -DGATEMP_SUPPORT

 LOCAL_MODULE_TAGS:= optional
 
 LOCAL_SRC_FILES:= $(IPC_ROOT)/linux/src/daemon/lad.c \
                   $(IPC_ROOT)/linux/src/daemon/MessageQ_daemon.c \
                   $(IPC_ROOT)/linux/src/daemon/MultiProc_daemon.c \
                   $(IPC_ROOT)/linux/src/daemon/NameServer_daemon.c \
 LOCAL_MODULE_TAGS:= optional
 
 LOCAL_SRC_FILES:= $(IPC_ROOT)/linux/src/daemon/lad.c \
                   $(IPC_ROOT)/linux/src/daemon/MessageQ_daemon.c \
                   $(IPC_ROOT)/linux/src/daemon/MultiProc_daemon.c \
                   $(IPC_ROOT)/linux/src/daemon/NameServer_daemon.c \

-                  $(IPC_ROOT)/linux/src/daemon/MultiProcCfg_dra7xx.c
+                  $(IPC_ROOT)/linux/src/daemon/MultiProcCfg_dra7xx.c \
+                  $(IPC_ROOT)/linux/src/daemon/GateMP_daemon.c \
+                  $(IPC_ROOT)/linux/src/daemon/GateHWSpinlock.c \
+                  $(IPC_ROOT)/linux/src/daemon/GateHWSpinlock_daemon.c \
+                  $(IPC_ROOT)/linux/src/daemon/GateHWSpinlockCfg_dra7xx.c \
+                  $(IPC_ROOT)/linux/src/api/gates/GateMutex.c

 
 LOCAL_SHARED_LIBRARIES := \
     liblog libtiipcutils_lad libtiipc
 
 LOCAL_SHARED_LIBRARIES := \
     liblog libtiipcutils_lad libtiipc