TheCloud/angelauramc-openjdk-build
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/angelauramc-openjdk-build.git synced 2025-09-12 13:45:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Try build use NDK r15 and Clang

Browse Source
This commit is contained in:
khanhduytran0 2020-09-14 12:48:42 +07:00
parent 1334cc897e
commit d61a274de1
6 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci_build.sh
View File

@ -2,7 +2,7 @@
set -e set -e
# We have OpenJDK 8, good enough # We have OpenJDK 8, good enough
export USE_SYSTEM_JDK_8=1 export USE_SYSTEM_JDK_8=1
wget -nv -O android-ndk-r10e-linux-x86_64.zip "https://dl.google.com/android/repository/android-ndk-r10e-linux-x86_64.zip" wget -nv -O android-ndk-r15-linux-x86_64.zip "https://dl.google.com/android/repository/android-ndk-r15-linux-x86_64.zip"
./extractndk.sh ./extractndk.sh
./getlibs.sh ./getlibs.sh
./maketoolchain.sh ./maketoolchain.sh

2
extractndk.sh
View File

@ -1,2 +1,2 @@
#!/bin/sh #!/bin/sh
unzip -q android-ndk-r10e-linux-x86_64.zip unzip -q android-ndk-r15-linux-x86_64.zip

2
maketoolchain.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
set -e set -e
export NDK_HOME=`pwd`/android-ndk-r10e export NDK_HOME=`pwd`/android-ndk-r15
$NDK_HOME/build/tools/make-standalone-toolchain.sh \ $NDK_HOME/build/tools/make-standalone-toolchain.sh \
--arch=arm64 \ --arch=arm64 \

2
maketoolchain_x86.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
set -e set -e
android-ndk-r10e/build/tools/make-standalone-toolchain.sh \ android-ndk-r15/build/tools/make-standalone-toolchain.sh \
--arch=x86 \ --arch=x86 \
--platform=android-21 \ --platform=android-21 \
--install-dir=`pwd`/android-ndk-r10e/generated-toolchains/android-x86-toolchain --install-dir=`pwd`/android-ndk-r10e/generated-toolchains/android-x86-toolchain

6
setdevkitpath.sh
View File

@ -1,7 +1,7 @@
# Override GitHub Actions env vars # Override GitHub Actions env vars
# if [[ -z "$NDK_HOME" ]]; then # if [[ -z "$NDK_HOME" ]]; then
export NDK_HOME=`pwd`/android-ndk-r10e export NDK_HOME=`pwd`/android-ndk-r15
# fi # fi
export NDK=$NDK_HOME export NDK=$NDK_HOME
@ -16,8 +16,8 @@ export LDFLAGS="-L$NDK/platforms/android-21/arch-arm64/usr/lib"
# Deprecated... # Deprecated...
export AR=$TOOLCHAIN/bin/$TARGET-ar export AR=$TOOLCHAIN/bin/$TARGET-ar
export AS=$TOOLCHAIN/bin/$TARGET-as export AS=$TOOLCHAIN/bin/$TARGET-as
export CC=$TOOLCHAIN/bin/$TARGET-gcc export CC=$TOOLCHAIN/bin/$TARGET-clang
export CXX=$TOOLCHAIN/bin/$TARGET-g++ export CXX=$TOOLCHAIN/bin/$TARGET-clang++
export LD=$TOOLCHAIN/bin/$TARGET-ld export LD=$TOOLCHAIN/bin/$TARGET-ld
export RANLIB=$TOOLCHAIN/bin/$TARGET-ranlib export RANLIB=$TOOLCHAIN/bin/$TARGET-ranlib
export STRIP=$TOOLCHAIN/bin/$TARGET-strip export STRIP=$TOOLCHAIN/bin/$TARGET-strip

32
setdevkitpath_x86.sh
View File

@ -1 +1,31 @@
export ANDROID_DEVKIT=`pwd`/android-ndk-r10e/generated-toolchains/android-x86-toolchain # Override GitHub Actions env vars
# if [[ -z "$NDK_HOME" ]]; then
export NDK_HOME=`pwd`/android-ndk-r15
# fi
export NDK=$NDK_HOME
export ANDROID_DEVKIT=$NDK/generated-toolchains/android-x86-toolchain
export TOOLCHAIN=$ANDROID_DEVKIT
export TARGET=i686-linux-android
export CPPFLAGS="-I$NDK/platforms/android-21/arch-x86/usr/include -I/usr/lib"
export LDFLAGS="-L$NDK/platforms/android-21/arch-x86/usr/lib"
# Configure and build.
# Deprecated...
export AR=$TOOLCHAIN/bin/$TARGET-ar
export AS=$TOOLCHAIN/bin/$TARGET-as
export CC=$TOOLCHAIN/bin/$TARGET-clang
export CXX=$TOOLCHAIN/bin/$TARGET-clang++
export LD=$TOOLCHAIN/bin/$TARGET-ld
export RANLIB=$TOOLCHAIN/bin/$TARGET-ranlib
export STRIP=$TOOLCHAIN/bin/$TARGET-strip
# export BUILD_AR=$AR
# export BUILD_AS=$AS
# export BUILD_CC=$CC
# export BUILD_CXX=$CXX
# export BUILD_LD=$LD
# export BUILD_RANLIB=$RANLIB
# export BUILD_STRIP=$STRIP