diff options
author | Gonzalo Exequiel Pedone | 2024-03-09 17:34:59 -0300 |
---|---|---|
committer | Gonzalo Exequiel Pedone | 2024-03-09 17:34:59 -0300 |
commit | 39ef227628469511fa9ad0b9f5d3a46bbcaaf76d (patch) | |
tree | c6513a4a0b7f667b41ff49bb60b83d71f69bff55 | |
parent | 843d3db72c7c5a720542181fb382b79d96cb74cb (diff) | |
download | aur-39ef227628469511fa9ad0b9f5d3a46bbcaaf76d.tar.gz |
Added support for riscv64 ABI. Added ANDROID_SYSROOT_INCLUDE, ANDROID_SYSROOT_LIB, and ANDROID_SYSROOT_LIB_API.
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 4 | ||||
-rwxr-xr-x | android-env.sh | 17 |
3 files changed, 21 insertions, 4 deletions
@@ -1,7 +1,7 @@ pkgbase = android-environment pkgdesc = Script providing common environment variables and functions for Android builds. - pkgver = 3 - pkgrel = 2 + pkgver = 4 + pkgrel = 1 url = https://aur.archlinux.org/packages/android-evironment arch = any license = MIT @@ -1,6 +1,6 @@ pkgname=android-environment -pkgver=3 -pkgrel=2 +pkgver=4 +pkgrel=1 pkgdesc='Script providing common environment variables and functions for Android builds.' arch=('any') url='https://aur.archlinux.org/packages/android-evironment' diff --git a/android-env.sh b/android-env.sh index 97e3a3ce0912..afebbb1a8906 100755 --- a/android-env.sh +++ b/android-env.sh @@ -48,25 +48,42 @@ export ANDROID_SYSROOT=${ANDROID_TOOLCHAIN}/sysroot export ANDROID_CROSS_PREFIX=$ANDROID_TOOLCHAIN/bin export ANDROID_PKGCONFIG=android-${_android_arch}-pkg-config + case "$_android_arch" in aarch64) + export ANDROID_SYSROOT_INCLUDE=${ANDROID_SYSROOT}/usr/include/aarch64-linux-android + export ANDROID_SYSROOT_LIB=${ANDROID_SYSROOT}/usr/lib/aarch64-linux-android export ANDROID_TOOLS_COMPILER_PREFIX=${ANDROID_CROSS_PREFIX}/aarch64-linux-android${ANDROID_MINIMUM_PLATFORM}- export ANDROID_ABI=arm64-v8a ;; armv7a-eabi) + export ANDROID_SYSROOT_INCLUDE=${ANDROID_SYSROOT}/usr/include/arm-linux-androideabi + export ANDROID_SYSROOT_LIB=${ANDROID_SYSROOT}/usr/lib/arm-linux-androideabi export ANDROID_TOOLS_COMPILER_PREFIX=${ANDROID_CROSS_PREFIX}/armv7a-linux-androideabi${ANDROID_MINIMUM_PLATFORM}- export ANDROID_ABI=armeabi-v7a ;; + riscv64) + export ANDROID_SYSROOT_INCLUDE=${ANDROID_SYSROOT}/usr/include/riscv64-linux-android + export ANDROID_SYSROOT_LIB=${ANDROID_SYSROOT}/usr/lib/riscv64-linux-android + export ANDROID_TOOLS_COMPILER_PREFIX=${ANDROID_CROSS_PREFIX}/riscv64-linux-android${ANDROID_MINIMUM_PLATFORM}- + export ANDROID_ABI=riscv64 + ;; x86) + export ANDROID_SYSROOT_INCLUDE=${ANDROID_SYSROOT}/usr/include/i686-linux-android + export ANDROID_SYSROOT_LIB=${ANDROID_SYSROOT}/usr/lib/i686-linux-android export ANDROID_TOOLS_COMPILER_PREFIX=${ANDROID_CROSS_PREFIX}/i686-linux-android${ANDROID_MINIMUM_PLATFORM}- export ANDROID_ABI=x86 ;; x86-64) + export ANDROID_SYSROOT_INCLUDE=${ANDROID_SYSROOT}/usr/include/x86_64-linux-android + export ANDROID_SYSROOT_LIB=${ANDROID_SYSROOT}/usr/lib/x86_64-linux-android export ANDROID_TOOLS_COMPILER_PREFIX=${ANDROID_CROSS_PREFIX}/x86_64-linux-android${ANDROID_MINIMUM_PLATFORM}- export ANDROID_ABI=x86_64 ;; esac + +export ANDROID_SYSROOT_LIB_API=${ANDROID_SYSROOT_LIB}/${ANDROID_MINIMUM_PLATFORM} export ANDROID_CC=${ANDROID_TOOLS_COMPILER_PREFIX}clang export ANDROID_CXX=${ANDROID_TOOLS_COMPILER_PREFIX}clang++ export ANDROID_TOOLS_PREFIX=${ANDROID_CROSS_PREFIX}/llvm- |