mirror of
https://github.com/AngelAuraMC/angelauramc-openjdk-build.git
synced 2025-09-08 11:50:34 -04:00
another fix
This commit is contained in:
parent
4cf35b848d
commit
d48e01218d
@ -4,8 +4,7 @@ set -e
|
||||
export FREETYPE_DIR=`pwd`/freetype-2.6.2/build_android-${TARGET_SHORT}
|
||||
export CUPS_DIR=`pwd`/cups-2.2.4
|
||||
|
||||
export CFLAGS+="-I$CUPS_DIR -I$FREETYPE_DIR/include/freetype2 -I/usr/include"
|
||||
export CXXFLAGS=$CFLAGS
|
||||
cp -R /usr/include/X11 $ANDROID_INCLUDE/
|
||||
|
||||
# My system's JDK is too old (7.0), so we add an Oracle boot JDK.
|
||||
# Set "USE_SYSTEM_JDK_8=1" to use system jdk instead
|
||||
@ -22,8 +21,6 @@ cp -R -f override-jre-files/* openjdk/
|
||||
cd openjdk
|
||||
rm -rf build
|
||||
bash ./configure \
|
||||
--with-extra-cflags="$CFLAGS" \
|
||||
--with-extra-cxxflags="$CXXFLAGS" \
|
||||
--enable-headless-only \
|
||||
--enable-option-checking=fatal \
|
||||
--openjdk-target=$TARGET \
|
||||
|
@ -5,7 +5,9 @@ export NDK=$NDK_HOME
|
||||
export ANDROID_DEVKIT=$NDK/generated-toolchains/android-${TARGET_SHORT}-toolchain
|
||||
export TOOLCHAIN=$ANDROID_DEVKIT
|
||||
|
||||
export CPPFLAGS="-I$NDK/platforms/android-21/arch-${TARGET_SHORT}/usr/include -I/usr/include -I/usr/lib"
|
||||
export ANDROID_INCLUDE=$NDK/platforms/android-21/arch-${TARGET_SHORT}/usr/include
|
||||
|
||||
export CPPFLAGS="-I$ANDROID_INCLUDE -I/usr/include -I/usr/lib"
|
||||
export LDFLAGS="-L$NDK/platforms/android-21/arch-${TARGET_SHORT}/usr/lib"
|
||||
|
||||
# Configure and build.
|
||||
|
Loading…
x
Reference in New Issue
Block a user