From ba0a9138644bf72d750073b578bb2acb2e2397af Mon Sep 17 00:00:00 2001 From: Jaeyun Date: Thu, 22 Aug 2019 17:20:02 +0900 Subject: [PATCH] [Api/Android] add target abi Update build script to set target abi. Signed-off-by: Jaeyun Jung --- api/android/api/jni/Application.mk | 5 +++-- api/android/build-android-lib.sh | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/api/android/api/jni/Application.mk b/api/android/api/jni/Application.mk index 3808c1a..89c3ce1 100644 --- a/api/android/api/jni/Application.mk +++ b/api/android/api/jni/Application.mk @@ -1,2 +1,3 @@ -APP_ABI = armeabi-v7a arm64-v8a x86 x86_64 -APP_STL = c++_shared +# Set target ABI in build.gradle (externalNativeBuild - abiFilters) +APP_ABI := armeabi-v7a arm64-v8a x86 x86_64 +APP_STL := c++_shared diff --git a/api/android/build-android-lib.sh b/api/android/build-android-lib.sh index d115e44..0e46ce6 100644 --- a/api/android/build-android-lib.sh +++ b/api/android/build-android-lib.sh @@ -10,6 +10,9 @@ # - NNSTREAMER_ROOT: NNStreamer root directory # +# Set target ABI (default 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64') +nnstreamer_target_abi="'armeabi-v7a', 'arm64-v8a'" + # Function to check if a package is installed function check_package() { which "$1" 2>/dev/null || { @@ -20,6 +23,7 @@ function check_package() { # Check required packages check_package svn +check_package sed # Android SDK (Set your own path) [ -z "$ANDROID_HOME" ] && echo "Need to set ANDROID_HOME." && exit 1 @@ -61,6 +65,8 @@ tar xJf ./ext-files/tensorflow-lite_armv7.tar.xz -C ./api/jni tar xJf ./ext-files/tensorflow-lite_x86.tar.xz -C ./api/jni tar xJf ./ext-files/tensorflow-lite_x86_64.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 -- 2.7.4