From 352d1d4928a1491913021cd8356e4e5b3a3197e4 Mon Sep 17 00:00:00 2001
From: Jaeyun <jy1210.jung@samsung.com>
Date: Tue, 3 Sep 2019 16:08:12 +0900
Subject: [PATCH] [Android] update script to remove warning

Clean up build script and remove warning about duplicates.

Signed-off-by: Jaeyun Jung <jy1210.jung@samsung.com>
---
 api/android/api/jni/Android-nnstreamer.mk |  5 ++++-
 api/android/build-android-lib.sh          | 17 ++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/api/android/api/jni/Android-nnstreamer.mk b/api/android/api/jni/Android-nnstreamer.mk
index 785d2b3..9f9f1ad 100644
--- a/api/android/api/jni/Android-nnstreamer.mk
+++ b/api/android/api/jni/Android-nnstreamer.mk
@@ -13,7 +13,7 @@ endif
 
 include $(NNSTREAMER_ROOT)/jni/nnstreamer.mk
 
-LOCAL_SRC_FILES := \
+NNSTREAMER_SRC_FILES := \
     $(NNSTREAMER_COMMON_SRCS) \
     $(NNSTREAMER_PLUGINS_SRCS) \
     $(NNSTREAMER_CAPI_SRCS) \
@@ -23,6 +23,9 @@ LOCAL_SRC_FILES := \
     $(NNSTREAMER_DECODER_IL_SRCS) \
     $(NNSTREAMER_DECODER_PE_SRCS)
 
+# Remove duplicates
+LOCAL_SRC_FILES := $(sort $(NNSTREAMER_SRC_FILES))
+
 LOCAL_C_INCLUDES := \
     $(NNSTREAMER_INCLUDES) \
     $(NNSTREAMER_CAPI_INCLUDES)
diff --git a/api/android/build-android-lib.sh b/api/android/build-android-lib.sh
index 42ec851..a209e8f 100644
--- a/api/android/build-android-lib.sh
+++ b/api/android/build-android-lib.sh
@@ -67,22 +67,25 @@ tar xJf ./ext-files/tensorflow-lite-$nnstreamer_tf_lite_ver.tar.xz -C ./api/jni
 sed -i "s|abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'|abiFilters $nnstreamer_target_abi|" api/build.gradle
 
 echo "Starting gradle build for Android library."
-./gradlew api:assembleRelease
+nnstreamer_android_api_lib=./api/build/outputs/aar/api-release.aar
 
-popd
+# Build Android library.
+./gradlew api:assembleRelease
 
 # Check if build procedure is done.
-nnstreamer_android_api_lib=./build_android_lib/api/build/outputs/aar/api-release.aar
-result_directory=android_lib
-
 if [[ -e $nnstreamer_android_api_lib ]]; then
+    result_directory=android_lib
+    today=$(date '+%Y-%m-%d')
+
     echo "Build procedure is done, copy NNStreamer library to $result_directory directory."
-    mkdir -p $result_directory
-    cp $nnstreamer_android_api_lib ./$result_directory/nnstreamer-api-$(date '+%Y-%m-%d').aar
+    mkdir -p ../$result_directory
+    cp $nnstreamer_android_api_lib ../$result_directory/nnstreamer-api-$today.aar
 else
     echo "Failed to build NNStreamer library."
 fi
 
+popd
+
 # Remove build directory
 rm -rf build_android_lib
 
-- 
2.7.4