[Android] Fix undefined definition

This patch defines ML_API_COMMON_ROOT previously undefined

**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/.gitignore b/.gitignore
index bf87f9672d3ae77a9634a07c06d9d98c58c08784..aab10d8827e1f6cde271aa654d67f276fff198e2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ iniparser/
 libs/
 obj/
 ml_api_common/
+openblas/
 
 # tflite for applications
 tensorflow-1.13.1

diff --git a/Applications/TransferLearning/Draw_Classification/jni/Android.mk b/Applications/TransferLearning/Draw_Classification/jni/Android.mk
index 2360364f8cf430b8e78badce9b2078d71da2c956..57b62d83659d099f9334bfc2ea64a79b7155b0df 100644 (file)
--- a/Applications/TransferLearning/Draw_Classification/jni/Android.mk
+++ b/Applications/TransferLearning/Draw_Classification/jni/Android.mk
@@ -11,7 +11,6 @@ ifndef NNTRAINER_ROOT
 NNTRAINER_ROOT := $(LOCAL_PATH)/../../../../
 endif
 
- ML_API_COMMON_INCLUDES := ${NNTRAINER_ROOT}/ml_api_common/include
 NNTRAINER_INCLUDES := $(NNTRAINER_ROOT)/nntrainer \
        $(NNTRAINER_ROOT)/nntrainer/dataset \
        $(NNTRAINER_ROOT)/nntrainer/layers \
@@ -22,50 +21,57 @@ NNTRAINER_INCLUDES := $(NNTRAINER_ROOT)/nntrainer \
        $(NNTRAINER_ROOT)/nntrainer/utils \
        $(NNTRAINER_ROOT)/api \
        $(NNTRAINER_ROOT)/api/ccapi/include \
-       $(NNTRAINER_ROOT)/api/capi/include \
-       ${ML_API_COMMON_INCLUDES}
+       $(NNTRAINER_ROOT)/api/capi/include
 
 NNTRAINER_APPLICATION := $(NNTRAINER_ROOT)/Applications
 
+ML_API_COMMON_ROOT := ${NNTRAINER_ROOT}/ml_api_common
+
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := nntrainer
-LOCAL_SRC_FILES := $(NNTRAINER_ROOT)/libs/$(TARGET_ARCH_ABI)/libnntrainer.so
+LOCAL_MODULE := gstreamer
+LOCAL_SRC_FILES := ${ML_API_COMMON_ROOT}/lib/arm64-v8a/libgstreamer_android.so
 
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := ccapi-nntrainer
-LOCAL_SRC_FILES := $(NNTRAINER_ROOT)/libs/$(TARGET_ARCH_ABI)/libccapi-nntrainer.so
-LOCAL_SHARED_LIBRARIES := nntrainer
+LOCAL_MODULE := ml-api-inference
+LOCAL_SRC_FILES :=  ${ML_API_COMMON_ROOT}/lib/arm64-v8a/libnnstreamer-native.so
+LOCAL_SHARED_LIBRARIES := gstreamer
+LOCAL_EXPORT_C_INCLUDES := $(ML_API_COMMON_ROOT)/include
+LOCAL_EXPORT_CFLAGS += -DUSE_BLAS=1
 
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := capi-nntrainer
-LOCAL_SRC_FILES := $(NNTRAINER_ROOT)/libs/$(TARGET_ARCH_ABI)/libcapi-nntrainer.so
-LOCAL_SHARED_LIBRARIES := ccapi-nntrainer
+LOCAL_MODULE := app_utils
+LOCAL_SRC_FILES := $(NNTRAINER_ROOT)/Applications/utils/libs/$(TARGET_ARCH_ABI)/libapp_utils.so
+APP_UTILS_INCLUDES := $(NNTRAINER_ROOT)/Applications/utils/jni/includes
 
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 
-ML_API_COMMON_INCLUDES := $(ML_API_COMMON_ROOT)/include
+LOCAL_MODULE := nntrainer
+LOCAL_SRC_FILES := $(NNTRAINER_ROOT)/libs/$(TARGET_ARCH_ABI)/libnntrainer.so
 
-LOCAL_MODULE := ml-api-inference
-LOCAL_SRC_FILES := $(ML_API_COMMON_ROOT)/lib/arm64-v8a/libnnstreamer-native.so
-LOCAL_EXPORT_C_INCLUDES := $(ML_API_COMMON_ROOT)/include
-LOCAL_EXPORT_CFLAGS += -DUSE_BLAS=1
+include $(PREBUILT_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := ccapi-nntrainer
+LOCAL_SRC_FILES := $(NNTRAINER_ROOT)/libs/$(TARGET_ARCH_ABI)/libccapi-nntrainer.so
+LOCAL_SHARED_LIBRARIES := nntrainer
 
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := app_utils
-LOCAL_SRC_FILES := $(NNTRAINER_ROOT)/Applications/utils/libs/$(TARGET_ARCH_ABI)/libapp_utils.so
-APP_UTILS_INCLUDES := $(NNTRAINER_ROOT)/Applications/utils/jni/includes
+LOCAL_MODULE := capi-nntrainer
+LOCAL_SRC_FILES := $(NNTRAINER_ROOT)/libs/$(TARGET_ARCH_ABI)/libcapi-nntrainer.so
+LOCAL_SHARED_LIBRARIES := ccapi-nntrainer ml-api-inference
 
 include $(PREBUILT_SHARED_LIBRARY)
 

diff --git a/jni/prepare_ml-api.sh b/jni/prepare_ml-api.sh
index 045d4cc0e0e18f2808c68c7ffe434ea59a333eff..3c0d7723012be18583f1af200d55f0f1715e051b 100755 (executable)
--- a/jni/prepare_ml-api.sh
+++ b/jni/prepare_ml-api.sh
@@ -48,7 +48,7 @@ function _cleanup_ml_api {
   rm -rf ${FILE_PREFIX}
   # cleanup all files other than ml_api and tizen_error
   find include ! \( -name '*.h' \) -type f -exec rm -f {} +
-  find lib ! \( -name 'libnnstreamer-native.so' \) -type f -exec rm -f {} +
+  find lib ! \( -name 'libnnstreamer-native.so' -or -name 'libgstreamer_android.so' \) -type f -exec rm -f {} +
 }
 
 [ ! -d "${FILE_PREFIX}" ] && _download_ml_api && _extract_ml_api \