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

Merge pull request #1 from PojavLauncherTeam/ndkr15clang

Browse Source 
Merge for success configure
This commit is contained in:
Tran Khanh Duy 2020-09-14 19:05:11 +07:00 committed by GitHub
commit b0488567d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 70682 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
buildjdk.sh
View File

@ -13,13 +13,20 @@ fi
sudo apt -y install gcc-multilib g++-multilib libxtst-dev libasound2-dev libelf-dev
# Patch for aarch64
cp -R -f openjdk-mobile-aarch64-patch/* openjdk/
# Remove generated script to regenerate aarch64 build
# rm openjdk/autoconf/generated-configure.sh
cd openjdk
rm -rf build
# --build=x86_64-linux-gnu \
# --hostt=aarch64-linux-android \
# --with-toolchain-type=clang \
bash ./configure \
--enable-option-checking=fatal \
--build=x86_64-linux-gnu \
--host=aarch64-linux-android \
--target=aarch64-linux-android \
--openjdk-target=aarch64-linux-android \
--disable-warnings-as-errors \
--enable-headless-only \
--with-jdk-variant=normal \

2
ci_build.sh
View File

@ -2,7 +2,7 @@
set -e
# We have OpenJDK 8, good enough
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
./getlibs.sh
./maketoolchain.sh

2
extractndk.sh
View File

@ -1,2 +1,2 @@
#!/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
set -e
export NDK_HOME=`pwd`/android-ndk-r10e
export NDK_HOME=`pwd`/android-ndk-r15
$NDK_HOME/build/tools/make-standalone-toolchain.sh \
--arch=arm64 \

2
maketoolchain_x86.sh
View File

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

1602
openjdk-mobile-aarch64-patch/common/autoconf/flags.m4 Normal file
View File

File diff suppressed because it is too large Load Diff

69034
openjdk-mobile-aarch64-patch/common/autoconf/generated-configure.sh.z Normal file
View File

File diff suppressed because it is too large Load Diff

2
setdevkitpath.sh
View File

@ -1,7 +1,7 @@
# Override GitHub Actions env vars
# if [[ -z "$NDK_HOME" ]]; then
export NDK_HOME=`pwd`/android-ndk-r10e
export NDK_HOME=`pwd`/android-ndk-r15
# fi
export NDK=$NDK_HOME

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