Update NDK build with common source location change

oic_malloc and oic_string are moved to resource/c_common directory
in the patch https://gerrit.iotivity.org/gerrit/#/c/1163/
Updating android make file with the changes to fix the build

Change-Id: I297b6a25ee6a7fd744174194f9e37a877ba7cd57
Signed-off-by: jnashok <jn.ashok@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1191
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>

diff --git a/resource/csdk/connectivity/build/android/jni/Android.mk b/resource/csdk/connectivity/build/android/jni/Android.mk
index 54233f6..158e359 100644 (file)
--- a/resource/csdk/connectivity/build/android/jni/Android.mk
+++ b/resource/csdk/connectivity/build/android/jni/Android.mk
@@ -12,18 +12,20 @@ $(info PLATFORM=$(APP_PLATFORM))
 #define build type
 BUILD = debug
 
-PROJECT_ROOT_PATH                       ?= ../..
-EXT_LIB_PATH                            = ../../../../../../extlibs
-PROJECT_API_PATH                        = $(PROJECT_ROOT_PATH)/api
-PROJECT_INC_PATH                        = $(PROJECT_ROOT_PATH)/inc
-PROJECT_SRC_PATH                        = $(PROJECT_ROOT_PATH)/src
-PROJECT_COMMON_PATH                     = $(PROJECT_ROOT_PATH)/common
-PROJECT_COMMON_INC_PATH                 = $(PROJECT_COMMON_PATH)/inc
-PROJECT_COMMON_SRC_PATH                 = $(PROJECT_COMMON_PATH)/src
-PROJECT_LIB_PATH                        = $(PROJECT_ROOT_PATH)/lib
-PROJECT_EXTERNAL_PATH                   = $(PROJECT_ROOT_PATH)/external/inc
-DTLS_LIB                                = $(EXT_LIB_PATH)/tinydtls
-#GLIB_PATH                               = ../../../../../../extlibs/glib/glib-2.40.2
+PROJECT_ROOT_PATH           ?= ../..
+ROOT_DIR_PATH               = ../../../../../..
+EXT_LIB_PATH                = $(ROOT_DIR_PATH)/extlibs
+PROJECT_API_PATH            = $(PROJECT_ROOT_PATH)/api
+PROJECT_INC_PATH            = $(PROJECT_ROOT_PATH)/inc
+PROJECT_SRC_PATH            = $(PROJECT_ROOT_PATH)/src
+PROJECT_COMMON_PATH         = $(PROJECT_ROOT_PATH)/common
+PROJECT_COMMON_INC_PATH     = $(PROJECT_COMMON_PATH)/inc
+PROJECT_COMMON_SRC_PATH     = $(PROJECT_COMMON_PATH)/src
+PROJECT_LIB_PATH            = $(PROJECT_ROOT_PATH)/lib
+PROJECT_EXTERNAL_PATH       = $(PROJECT_ROOT_PATH)/external/inc
+DTLS_LIB                    = $(EXT_LIB_PATH)/tinydtls
+OIC_C_COMMON_PATH           = $(ROOT_DIR_PATH)/resource/c_common
+#GLIB_PATH                  = ../../../../../../extlibs/glib/glib-2.40.2
 
 #Modify below values to enable/disable the Adapter
 #Suffix "NO_" to disable given adapter
@@ -74,6 +76,24 @@ include $(CLEAR_VARS)
 include $(DTLS_LIB)/Android.mk
 
 #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#Build OIC C Common libraries required for CA
+
+include $(CLEAR_VARS)
+LOCAL_MODULE = OICCommon
+
+#Build Common Libraries
+LOCAL_PATH = $(OIC_C_COMMON_PATH)
+LOCAL_CFLAGS = -D__ANDROID__ $(DEBUG_FLAG)
+LOCAL_CFLAGS += -std=c99
+
+LOCAL_C_INCLUDES = $(OIC_C_COMMON_PATH)/oic_malloc/include \
+                   $(OIC_C_COMMON_PATH)/oic_string/include
+LOCAL_SRC_FILES  = oic_malloc/src/oic_malloc.c \
+                   oic_string/src/oic_string.c
+
+include $(BUILD_STATIC_LIBRARY)
+
+#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 #Build CACommon
 
 include $(CLEAR_VARS)
@@ -84,16 +104,18 @@ LOCAL_MODULE = CACommon
 LOCAL_LDLIBS += -L$(SYSROOT)/usr/lib -llog
 #LOCAL_SHARED_LIBRARIES = Glib GLibThread
 LOCAL_STATIC_LIBRARIES = rt pthread
+LOCAL_STATIC_LIBRARIES += OICCommon
 
 LOCAL_CFLAGS = -D__ANDROID__ $(DEBUG_FLAG)
 LOCAL_CFLAGS += -std=c99
 
 LOCAL_C_INCLUDES = $(PROJECT_COMMON_INC_PATH)
 LOCAL_C_INCLUDES += $(PROJECT_API_PATH)
+LOCAL_C_INCLUDES += $(OIC_C_COMMON_PATH)/oic_malloc/include
+LOCAL_C_INCLUDES += $(OIC_C_COMMON_PATH)/oic_string/include
 
-LOCAL_SRC_FILES =       oic_logger.c \
-                        oic_console_logger.c logger.c oic_malloc.c \
-                        uarraylist.c uqueue.c oic_string.c \
+LOCAL_SRC_FILES =       oic_logger.c oic_console_logger.c logger.c \
+                        uarraylist.c uqueue.c \
                         cathreadpool_pthreads.c camutex_pthreads.c
 
 include $(BUILD_STATIC_LIBRARY)
@@ -138,6 +160,9 @@ LOCAL_C_INCLUDES += $(PROJECT_COMMON_INC_PATH)
 LOCAL_C_INCLUDES += $(PROJECT_INC_PATH)
 LOCAL_C_INCLUDES += $(PROJECT_LIB_PATH)/libcoap-4.1.1
 LOCAL_C_INCLUDES += $(PROJECT_EXTERNAL_PATH)
+LOCAL_C_INCLUDES += $(OIC_C_COMMON_PATH)/oic_malloc/include
+LOCAL_C_INCLUDES += $(OIC_C_COMMON_PATH)/oic_string/include
+
 LOCAL_C_INCLUDES += $(DTLS_LIB)
 
 LOCAL_CFLAGS += $(BUILD_FLAG)