[ Fix ] Fix android build error with meson

This commit includes,
  . Fix android build issues
    : openblas link and download

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

Signed-off-by: jijoong.moon <jijoong.moon@samsung.com>

diff --git a/jni/Android.mk b/jni/Android.mk
index 4f07dae..601efb5 100644 (file)
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -4,6 +4,7 @@ include $(CLEAR_VARS)
 
 ENABLE_TFLITE_BACKBONE := 1
 ENABLE_TFLITE_INTERPRETER := 1
+ENABLE_BLAS := 1
 
 NEED_TF_LITE := 0
 
@@ -95,9 +96,9 @@ LOCAL_SRC_FILES := $(OPENBLAS_ROOT)/lib/libopenblas.a
 LOCAL_EXPORT_C_INCLUDES := $(OPENBLAS_ROOT)/include
 LOCAL_EXPORT_CFLAGS += -DUSE_BLAS=1
 
+include $(PREBUILT_STATIC_LIBRARY)
 include $(CLEAR_VARS)
 
-include $(PREBUILT_STATIC_LIBRARY)
 endif #ENABLE_BLAS
 
 ## prepare ml common api if nothing present

diff --git a/jni/prepare_openblas.sh b/jni/prepare_openblas.sh
index fed559c..a39867f 100755 (executable)
--- a/jni/prepare_openblas.sh
+++ b/jni/prepare_openblas.sh
@@ -11,7 +11,7 @@
 # usage: ./prepare_openblas.sh target
 
 TARGET=$1
-FILE_PREFIX=openblas
+TAR_PREFIX=openblas
 TAR_NAME=${TAR_PREFIX}-0.2.20.tar.gz
 URL="https://github.com/nnstreamer/nnstreamer-android-resource/raw/master/external/${TAR_NAME}"