TheCloud/angelauramc-openjdk-build
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/angelauramc-openjdk-build.git synced 2025-08-03 23:55:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fallback to NDK r10e

Browse Source
This commit is contained in:
khanhduytran0 2020-09-15 13:17:23 +07:00
parent 6bca2103f0
commit bfd87815b7
7 changed files with 11 additions and 15 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-r15-linux-x86_64.zip "https://dl.google.com/android/repository/android-ndk-r15-linux-x86_64.zip" wget -nv -O android-ndk-r10e-linux-x86_64.zip "https://dl.google.com/android/repository/android-ndk-r10e-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-r15-linux-x86_64.zip unzip -q android-ndk-r10e-linux-x86_64.zip

2
makejdkwithoutconfigure.sh
View File

@ -2,7 +2,7 @@
# duplicate of buildjdk.sh that avoids reconfiguring. Used for making changes to openjdk code. # duplicate of buildjdk.sh that avoids reconfiguring. Used for making changes to openjdk code.
set -e set -e
bash setdevkitpath.sh . setdevkitpath.sh
export FREETYPE_DIR=`pwd`/freetype-2.6.2/build_android-arm64 export FREETYPE_DIR=`pwd`/freetype-2.6.2/build_android-arm64
export CUPS_DIR=`pwd`/cups-2.2.4 export CUPS_DIR=`pwd`/cups-2.2.4

4
maketoolchain.sh
View File

@ -1,9 +1,9 @@
#!/bin/bash #!/bin/bash
set -e set -e
export NDK_HOME=`pwd`/android-ndk-r15 . setdevkitpath.sh
$NDK_HOME/build/tools/make-standalone-toolchain.sh \ $NDK/build/tools/make-standalone-toolchain.sh \
--arch=arm64 \ --arch=arm64 \
--platform=android-21 \ --platform=android-21 \
--install-dir=$NDK_HOME/generated-toolchains/android-arm64-toolchain --install-dir=$NDK_HOME/generated-toolchains/android-arm64-toolchain

3
maketoolchain_x86.sh
View File

@ -1,6 +1,7 @@
#!/bin/bash #!/bin/bash
set -e set -e
android-ndk-r15/build/tools/make-standalone-toolchain.sh \ . setdevkitpath_x86.sh
$NDK/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

11
setdevkitpath.sh
View File

@ -1,18 +1,13 @@
# Override GitHub Actions env vars # Override GitHub Actions env vars
export NDK_HOME=`pwd`/android-ndk-r10e
# if [[ -z "$NDK_HOME" ]]; then
export NDK_HOME=`pwd`/android-ndk-r15
# fi
export NDK=$NDK_HOME export NDK=$NDK_HOME
export ANDROID_DEVKIT=$NDK/generated-toolchains/android-arm64-toolchain export ANDROID_DEVKIT=$NDK/generated-toolchains/android-arm64-toolchain
export TOOLCHAIN=$ANDROID_DEVKIT export TOOLCHAIN=$ANDROID_DEVKIT
export TARGET=aarch64-linux-android export TARGET=aarch64-linux-android
ANDROID_API_FLAGS="-D__ANDROID_API__=21" export CPPFLAGS="-I$NDK/platforms/android-21/arch-arm64/usr/include -I/usr/lib"
export CFLAGS="$ANDROID_API_FLAGS" export LDFLAGS="-L$NDK/platforms/android-21/arch-arm64/usr/lib"
export CPPFLAGS="$ANDROID_API_FLAGS -I$NDK/platforms/android-21/arch-arm64/usr/include -I/usr/lib"
export LDFLAGS="$ANDROID_API_FLAGS -L$NDK/platforms/android-21/arch-arm64/usr/lib"
# Configure and build. # Configure and build.
# Deprecated... # Deprecated...

2
setdevkitpath_x86.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-r15 export NDK_HOME=`pwd`/android-ndk-r10e
# fi # fi
export NDK=$NDK_HOME export NDK=$NDK_HOME