[API/Android] Modify build script to use the mock tizen_error header

This patch modifies the build script for Android API to use mock
tizen_error.h, recently added.

Signed-off-by: Wook Song <wook16.song@samsung.com>

diff --git a/api/android/build-android-lib.sh b/api/android/build-android-lib.sh
index 856a62e..a9af36a 100644 (file)
--- a/api/android/build-android-lib.sh
+++ b/api/android/build-android-lib.sh
@@ -87,7 +87,6 @@ function check_package() {
 # Check required packages
 check_package svn
 check_package sed
-check_package patch
 check_package zip
 
 # Android SDK (Set your own path)
@@ -109,11 +108,6 @@ echo "NNStreamer root directory: $NNSTREAMER_ROOT"
 echo "Start to build NNStreamer library for Android."
 pushd $NNSTREAMER_ROOT
 
-# Modify header for Android
-if ! patch -R --dry-run -sfp1 -i $NNSTREAMER_ROOT/packaging/non_tizen_build.patch; then
-    patch -sfp1 -i $NNSTREAMER_ROOT/packaging/non_tizen_build.patch
-fi
-
 # Make directory to build NNStreamer library
 mkdir -p build_android_lib
 
@@ -194,9 +188,6 @@ popd
 # Remove build directory
 rm -rf build_android_lib
 
-# Clean the applied patches
-patch -R -sfp1 -i $NNSTREAMER_ROOT/packaging/non_tizen_build.patch
-
 popd
 
 # exit with success/failure status

diff --git a/jni/nnstreamer.mk b/jni/nnstreamer.mk
index a18b61a..cc066cf 100644 (file)
--- a/jni/nnstreamer.mk
+++ b/jni/nnstreamer.mk
@@ -42,6 +42,7 @@ NNSTREAMER_PLUGINS_SRCS := \
 
 # nnstreamer c-api
 NNSTREAMER_CAPI_INCLUDES := \
+    $(NNSTREAMER_CAPI_HOME)/include/platform \
     $(NNSTREAMER_CAPI_HOME)/include
 
 NNSTREAMER_CAPI_SRCS := \