diff options
| author | Nikhil Raj <nikhil.raj@arm.com> | 2023-11-24 16:25:10 +0000 |
|---|---|---|
| committer | Nikhil Raj <nikhil.raj@arm.com> | 2023-12-04 18:29:03 +0000 |
| commit | ba6dcb2f0625ceba24e698e10457d19cd00ccd91 (patch) | |
| tree | 9fe2b44a0dbdfd32ace2476a0ce3d8637740f0c3 /build-tool | |
| parent | 8073c9cdab3df37817a61ab510606498e53b14a8 (diff) | |
| download | armnn-ba6dcb2f0625ceba24e698e10457d19cd00ccd91.tar.gz | |
IVGCVSW-8168 Fix errors while using build tool for android target
* Add Android compiler flag
* Install llvm package for docker compilation
Signed-off-by: Nikhil Raj <nikhil.raj@arm.com>
Change-Id: I9054b64e372fe9d9181d9b2321be86b3f3d95267
Diffstat (limited to 'build-tool')
| -rwxr-xr-x | build-tool/scripts/build-armnn.sh | 8 | ||||
| -rwxr-xr-x | build-tool/scripts/common.sh | 4 | ||||
| -rwxr-xr-x | build-tool/scripts/install-packages.sh | 3 | ||||
| -rwxr-xr-x | build-tool/scripts/setup-armnn.sh | 9 |
4 files changed, 14 insertions, 10 deletions
diff --git a/build-tool/scripts/build-armnn.sh b/build-tool/scripts/build-armnn.sh index 147aedfd55..c3bf2f5f43 100755 --- a/build-tool/scripts/build-armnn.sh +++ b/build-tool/scripts/build-armnn.sh @@ -43,7 +43,7 @@ build_acl() ;; "android64") - compile_flags+="$AARCH64_COMPILER_FLAGS" + compile_flags+="$ANDROID64_COMPILER_FLAGS" acl_arch="arch=arm64-v8a" ;; @@ -63,12 +63,12 @@ build_acl() if [ "$TARGET_ARCH" == "android64" ]; then eval "$compile_flags" \ - scons toolchain_prefix=llvm- \ - compiler_prefix=aarch64-linux-android$ANDROID_API_VERSION- \ + scons toolchain_prefix=llvm- compiler_prefix="" \ "$acl_arch" \ "$acl_params" \ + build_dir="$ACL_BUILD_TARGET" \ "$extra_cxx_flags" \ - os=android -j "$NUM_THREADS" + build=cross_compile os=android else eval "$compile_flags" \ scons "$native_flag" \ diff --git a/build-tool/scripts/common.sh b/build-tool/scripts/common.sh index d966a358f7..419d2784f8 100755 --- a/build-tool/scripts/common.sh +++ b/build-tool/scripts/common.sh @@ -45,8 +45,8 @@ NDK_SRC="$SOURCE_DIR"/android-ndk-r"$NDK_VERSION" # ANDROID ANDROID_API_VERSION=30 ANDROID_ARM_ARCH="arm64-v8a" -ANDROID64_x86_TOOLCHAIN+="$NDK_SRC/toolchains/llvm/prebuilt/linux-x86_64" -ANDROID64_COMPILER_FLAGS+="CC="$ANDROID64_x86_TOOLCHAIN"/bin/aarch64-linux-android"$ANDROID_API_VERSION"-clang \ +ANDROID64_x86_TOOLCHAIN="$NDK_SRC/toolchains/llvm/prebuilt/linux-x86_64/" +ANDROID64_COMPILER_FLAGS="CC="$ANDROID64_x86_TOOLCHAIN"/bin/aarch64-linux-android"$ANDROID_API_VERSION"-clang \ CXX="$ANDROID64_x86_TOOLCHAIN"/bin/aarch64-linux-android"$ANDROID_API_VERSION"-clang++ " # Flatbuffers diff --git a/build-tool/scripts/install-packages.sh b/build-tool/scripts/install-packages.sh index e043475dae..1a238b6c98 100755 --- a/build-tool/scripts/install-packages.sh +++ b/build-tool/scripts/install-packages.sh @@ -78,7 +78,8 @@ install_apt_packages() scons \ unzip \ wget \ - xxd + xxd \ + llvm # Install cross compile toolchains if host is x86_64 if [ "$HOST_ARCH" == "x86_64" ]; then diff --git a/build-tool/scripts/setup-armnn.sh b/build-tool/scripts/setup-armnn.sh index db2ef2a4ee..cf0ee00275 100755 --- a/build-tool/scripts/setup-armnn.sh +++ b/build-tool/scripts/setup-armnn.sh @@ -128,9 +128,12 @@ build_flatbuffers() if [ "$native_build" -eq 0 ]; then mkdir -p "$FLATBUFFERS_BUILD_TARGET" - if [ "$TARGET_ARCH" == "aarch64" ] || [ "$TARGET_ARCH" == "android64" ]; then + if [ "$TARGET_ARCH" == "aarch64" ]; then cmake_flags+="$AARCH64_COMPILER_FLAGS" fi + if [ "$TARGET_ARCH" == "android64" ]; then + cmake_flags+="$ANDROID64_COMPILER_FLAGS" + fi else target_arch="$HOST_ARCH" mkdir -p "$FLATBUFFERS_BUILD_HOST" @@ -200,7 +203,7 @@ build_tflite() fi ;; "android64") - cmake_flags+="$AARCH64_COMPILER_FLAGS" + cmake_flags+="$ANDROID64_COMPILER_FLAGS" if [ "$NATIVE_BUILD" -eq 0 ]; then target_arch_cmd="-DCMAKE_TOOLCHAIN_FILE=$NDK_SRC/build/cmake/android.toolchain.cmake \ -DANDROID_ABI=$ANDROID_ARM_ARCH \ @@ -456,4 +459,4 @@ fi echo -e "\n***** Arm NN setup complete. Now build with build-armnn.sh. *****\n" -exit 0
\ No newline at end of file +exit 0 |