Android/ARM64: fixed incorrect path of libs/obj

This commit is to update correctly the existing path of libs and obj folder
after improving the configuration file to generate a C/C++ library.

**Changelog**
1. Fixed indentation
2. Replaced ../{libs,obj} with ./{libs,obj}

Signed-off-by: Geunsik Lim <geunsik.lim@samsung.com>

diff --git a/jni/Android-app.mk b/jni/Android-app.mk
index 999249c..6f1721d 100644 (file)
--- a/jni/Android-app.mk
+++ b/jni/Android-app.mk
@@ -8,8 +8,8 @@ LOCAL_PATH := $(call my-dir)
 # ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android-app.mk NDK_APPLICATION_MK=./Application.mk -j$(nproc)
 #
 # Step2: Install a test application into Android target device
-# readelf -d ../libs/arm64-v8a/{your-test-app}
-# adb push   ../libs/arm64-v8a/{your-test-app} /data/nnstreamer/
+# readelf -d ./libs/arm64-v8a/{your-test-app}
+# adb push   ./libs/arm64-v8a/{your-test-app} /data/nnstreamer/
 #
 # Step3: Run the test application
 # adb shell

diff --git a/jni/Android-nnstreamer.mk b/jni/Android-nnstreamer.mk
index 99f7957..42348fd 100644 (file)
--- a/jni/Android-nnstreamer.mk
+++ b/jni/Android-nnstreamer.mk
@@ -20,11 +20,11 @@ LOCAL_PATH := $(call my-dir)
 # ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android-nnstreamer.mk NDK_APPLICATION_MK=./Application.mk -j$(nproc)
 #
 # Step4: Install the nnstreamer library into Android target device
-# for i in ../libs/arm64-v8a/*.so ; do echo "$i" ; adb push "$i" /data/nnstreamer/libgstreamer/; done;
+# for i in ./libs/arm64-v8a/*.so ; do echo "$i" ; adb push "$i" /data/nnstreamer/libgstreamer/; done;
 # adb shell ln -s /data/nnstreamer/libgstreamer/libharfbuzz.so   /data/nnstreamer/libgstreamer/libharfbuzz.so.0
 # adb shell ln -s /data/nnstreamer/libgstreamer/libbz2.so        /data/nnstreamer/libgstreamer/libbz2.so.1.0
 # adb shell mv /data/nnstreamer/libgstreamer/libnnstreamer.so    /data/nnstreamer/libnnstreamer/
-# cp ../libs/arm64-v8a/libnnstreamer.so $GSTREAMER_ROOT_ANDROID/arm64/lib/gstreamer-1.0/
+# cp ./libs/arm64-v8a/libnnstreamer.so $GSTREAMER_ROOT_ANDROID/arm64/lib/gstreamer-1.0/
 #
 
 NNSTREAMER_VERSION := 0.1.1
@@ -83,10 +83,10 @@ $(foreach item,$(so_names_gst),$(eval $(call shared_lib_gst,$(item))))
 include $(CLEAR_VARS)
 
 # Please keep the pthread and openmp library for checking a compatibility
-LOCAL_ARM_NEON := true
-LOCAL_CFLAGS   += -O0 -DVERSION=\"$(NNSTREAMER_VERSION)\"
-LOCAL_CXXFLAGS += -std=c++11
-LOCAL_CFLAGS   += -pthread -fopenmp
+LOCAL_ARM_NEON      := true
+LOCAL_CFLAGS        += -O0 -DVERSION=\"$(NNSTREAMER_VERSION)\"
+LOCAL_CXXFLAGS      += -std=c++11
+LOCAL_CFLAGS        += -pthread -fopenmp
 
 LOCAL_LDFLAGS       += -fuse-ld=bfd
 LOCAL_MODULE_TAGS   := optional