Update buildjdk.sh

This commit is contained in:
Tran Khanh Duy 2020-10-19 20:26:34 +07:00 committed by GitHub
parent 842aff8354
commit 034fed6786
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# set -e set -e
. setdevkitpath.sh . setdevkitpath.sh
export FREETYPE_DIR=`pwd`/freetype-2.6.2/build_android-${TARGET_SHORT} export FREETYPE_DIR=`pwd`/freetype-2.6.2/build_android-${TARGET_SHORT}
export CUPS_DIR=`pwd`/cups-2.2.4 export CUPS_DIR=`pwd`/cups-2.2.4
@ -11,7 +11,7 @@ cp -R /usr/include/X11 $ANDROID_INCLUDE/
# It isn't good, but need make it build anyways # It isn't good, but need make it build anyways
cp -R $CUPS_DIR/* $ANDROID_INCLUDE/ cp -R $CUPS_DIR/* $ANDROID_INCLUDE/
sudo apt -y install gcc-multilib g++-multilib systemtap-sdt-devel libx11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev libasound2-dev libelf-dev libfontconfig1-dev sudo apt -y install systemtap-sdt-dev gcc-multilib g++-multilib libxtst-dev libasound2-dev libelf-dev libfontconfig1-dev libx11-dev
cp -R /usr/include/fontconfig $ANDROID_INCLUDE/ cp -R /usr/include/fontconfig $ANDROID_INCLUDE/
@ -29,8 +29,7 @@ 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 \
--x-includes=$ANDROID_INCLUDE \ --x-includes=$ANDROID_INCLUDE \
--x-libraries=/usr/lib --x-libraries=/usr/lib || \
error_code=$? error_code=$?
if [ "$error_code" -ne 0 ]; then if [ "$error_code" -ne 0 ]; then
echo "\n\nCONFIGURE ERROR $error_code , config.log:" echo "\n\nCONFIGURE ERROR $error_code , config.log:"