[Android] Enable capi/ccapi build

This patch enable capi/ccapi build

**Self evaluation:**
1. Build test: [X]Passed [ ]Failed [ ]Skipped
2. Run test: [X]Passed [ ]Failed [ ]Skipped

Signed-off-by: Jihoon Lee <jhoon.it.lee@samsung.com>

diff --git a/jni/Android.mk.in b/jni/Android.mk.in
index abceca0..1bd641a 100644 (file)
--- a/jni/Android.mk.in
+++ b/jni/Android.mk.in
@@ -1,4 +1,3 @@
-# ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk NDK_APPLICATION_MK=./Application.mk -j2
 LOCAL_PATH := $(call my-dir)
 
 MESON_HAS_TFLITE := @MESON_HAS_TFLITE@
@@ -47,7 +46,8 @@ LOCAL_MODULE_TAGS   := optional
 
 LOCAL_SRC_FILES     := @MESON_INIPARSER_ROOT@/src/iniparser.c \
                                                                                         @MESON_INIPARSER_ROOT@/src/dictionary.c
-LOCAL_EXPORT_C_INCLUDES    := @MESON_INIPARSER_ROOT@/src
+LOCAL_C_INCLUDES    := @MESON_INIPARSER_ROOT@/src
+LOCAL_EXPORT_C_INCLUDES  := $(LOCAL_C_INCLUDES)
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -56,6 +56,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE        := nntrainer
 LOCAL_SRC_FILES     := @MESON_NNTRAINER_SRCS@
 LOCAL_C_INCLUDES    := @MESON_NNTRAINER_INCS@
+LOCAL_EXPORT_C_INCLUDES  := $(LOCAL_C_INCLUDES)
 
 LOCAL_ARM_NEON      := true
 LOCAL_CFLAGS        += -pthread -fexceptions -fopenmp @MESON_CFLAGS@
@@ -72,8 +73,43 @@ endif # MESON_HAS_TFLITE
 
 include $(BUILD_SHARED_LIBRARY)
 
+include $(CLEAR_VARS)
+
+LOCAL_MODULE        := ccapi-nntrainer
+LOCAL_SRC_FILES     := @MESON_CCAPI_NNTRAINER_SRCS@
+LOCAL_C_INCLUDES    := @MESON_CCAPI_NNTRAINER_INCS@
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
+
+LOCAL_ARM_NEON      := true
+LOCAL_CFLAGS        += -pthread -fexceptions -fopenmp @MESON_CFLAGS@
+LOCAL_CXXFLAGS      += -std=c++17 -frtti -fexceptions
+LOCAL_MODULE_TAGS   := optional
+
+LOCAL_LDLIBS        := -llog -landroid
+
+LOCAL_STATIC_LIBRARIES += nntrainer
+
 include $(BUILD_SHARED_LIBRARY)
 
+include $(CLEAR_VARS)
+
+LOCAL_MODULE        := capi-nntrainer
+LOCAL_SRC_FILES     := @MESON_CAPI_NNTRAINER_SRCS@
+LOCAL_C_INCLUDES    := @MESON_CAPI_NNTRAINER_INCS@
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
+
+LOCAL_ARM_NEON      := true
+LOCAL_CFLAGS        += -pthread -fexceptions -fopenmp @MESON_CFLAGS@
+LOCAL_CXXFLAGS      += -std=c++17 -frtti -fexceptions
+LOCAL_MODULE_TAGS   := optional
+
+LOCAL_LDLIBS        := -llog -landroid
+
+LOCAL_STATIC_LIBRARIES += ccapi-nntrainer nntrainer ml-api-inference
+
+include $(BUILD_SHARED_LIBRARY)
+
+
 
 
 

diff --git a/jni/meson.build b/jni/meson.build
index 1ccdf63..bf10e68 100644 (file)
--- a/jni/meson.build
+++ b/jni/meson.build
@@ -1,9 +1,16 @@
 and_conf = configuration_data()
 
 and_conf.set('MESON_CFLAGS', ' '.join(extra_defines))
-and_conf.set('MESON_INIPARSER_ROOT', iniparser_root)
 and_conf.set('MESON_NNTRAINER_SRCS', ' '.join(nntrainer_sources))
 and_conf.set('MESON_NNTRAINER_INCS', ' '.join(nntrainer_inc_abs))
+and_conf.set('MESON_CCAPI_NNTRAINER_SRCS', ' '.join(ccapi_src))
+and_conf.set('MESON_CCAPI_NNTRAINER_INCS', ' '.join(ccapi_inc_abs))
+and_conf.set('MESON_CAPI_NNTRAINER_SRCS', ' '.join(capi_src))
+and_conf.set('MESON_CAPI_NNTRAINER_INCS', ' '.join(capi_inc_abs))
+
+if iniparser_dep.found()
+  and_conf.set('MESON_INIPARSER_ROOT', iniparser_root)
+endif
 
 if tflite_dep.found()
   and_conf.set('MESON_HAS_TFLITE', 1)