Port to arm64

This commit is contained in:
TheTangyLemon 2020-06-29 15:49:04 -07:00
parent f43167fc6a
commit c631af715b
5 changed files with 12 additions and 12 deletions

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
set -e set -e
. setdevkitpath.sh . setdevkitpath.sh
export FREETYPE_DIR=`pwd`/freetype-2.6.2/build_android-arm export FREETYPE_DIR=`pwd`/freetype-2.6.2/build_android-aarch64
export CUPS_DIR=`pwd`/cups-2.2.4 export CUPS_DIR=`pwd`/cups-2.2.4
# My system's JDK is too old (7.0), so we add an Oracle boot JDK. # My system's JDK is too old (7.0), so we add an Oracle boot JDK.
@ -16,8 +16,8 @@ rm -rf build
bash ./configure \ bash ./configure \
--enable-option-checking=fatal \ --enable-option-checking=fatal \
--build=x86_64-unknown-linux-gnu \ --build=x86_64-unknown-linux-gnu \
--host=arm-linux-androideabi \ --host=aarch64-linux-android \
--target=arm-linux-androideabi \ --target=aarch64-linux-android \
--disable-warnings-as-errors \ --disable-warnings-as-errors \
--enable-headless-only \ --enable-headless-only \
--with-jdk-variant=normal \ --with-jdk-variant=normal \
@ -27,5 +27,5 @@ bash ./configure \
--with-freetype-lib=$FREETYPE_DIR/lib \ --with-freetype-lib=$FREETYPE_DIR/lib \
--with-freetype-include=$FREETYPE_DIR/include/freetype2 --with-freetype-include=$FREETYPE_DIR/include/freetype2
cd build/android-arm-normal-server-release cd build/android-aarch64-normal-server-release
make JOBS=4 images make JOBS=4 images

View File

@ -7,8 +7,8 @@ echo "Building Freetype"
cd freetype-2.6.2 cd freetype-2.6.2
./configure \ ./configure \
--host=arm-linux-androideabi \ --host=aarch64-linux-android \
--prefix=`pwd`/build_android-arm \ --prefix=`pwd`/build_android-aarch64 \
--without-zlib \ --without-zlib \
--with-png=no \ --with-png=no \
--with-harfbuzz=no --with-harfbuzz=no

View File

@ -1,3 +0,0 @@
DEVKIT_NAME="Android ARM"
DEVKIT_TOOLCHAIN_PATH="$DEVKIT_ROOT/arm-linux-androideabi/bin"
DEVKIT_SYSROOT="$DEVKIT_ROOT/sysroot"

3
devkit.info.arm64 Normal file
View File

@ -0,0 +1,3 @@
DEVKIT_NAME="Android ARM64"
DEVKIT_TOOLCHAIN_PATH="$DEVKIT_ROOT/aarch64-linux-android/bin"
DEVKIT_SYSROOT="$DEVKIT_ROOT/sysroot"

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
set -e set -e
android-ndk-r10e/build/tools/make-standalone-toolchain.sh \ android-ndk-r10e/build/tools/make-standalone-toolchain.sh \
--arch=arm \ --arch=arm64 \
--platform=android-21 \ --platform=android-21 \
--install-dir=`pwd`/android-ndk-r10e/generated-toolchains/android-arm-toolchain --install-dir=`pwd`/android-ndk-r10e/generated-toolchains/android-arm64-toolchain
cp devkit.info.arm android-ndk-r10e/generated-toolchains/android-arm-toolchain/ cp devkit.info.arm64 android-ndk-r10e/generated-toolchains/android-arm-toolchain/