From 95ca3d6a77b6129769b46e4b8d12f7aa205f5e6a Mon Sep 17 00:00:00 2001
From: khanhduytran0 <khanhduytran032@gmail.com>
Date: Thu, 22 Oct 2020 12:01:56 +0700
Subject: [PATCH] Attempt to get faster build time

---
 buildjdk.sh        | 2 --
 buildlibs.sh       | 4 +++-
 ci_build_global.sh | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/buildjdk.sh b/buildjdk.sh
index 9aa9605..435a7d9 100755
--- a/buildjdk.sh
+++ b/buildjdk.sh
@@ -10,8 +10,6 @@ export CPPFLAGS+=" -DHEADLESS" # -I$FREETYPE_DIR -I$CUPS_DIR
 # It isn't good, but need make it build anyways
 # cp -R $CUPS_DIR/* $ANDROID_INCLUDE/
 
-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/X11 $ANDROID_INCLUDE/
 # cp -R /usr/include/fontconfig $ANDROID_INCLUDE/
 
diff --git a/buildlibs.sh b/buildlibs.sh
index b8820d7..9db1b84 100755
--- a/buildlibs.sh
+++ b/buildlibs.sh
@@ -12,6 +12,8 @@ cd freetype-2.6.2
 	--without-zlib \
 	--with-png=no \
 	--with-harfbuzz=no
-make -j4
+make -j4 | \
+sudo apt -y install systemtap-sdt-dev gcc-multilib g++-multilib libxtst-dev libasound2-dev libelf-dev libfontconfig1-dev libx11-dev
+
 make install
 
diff --git a/ci_build_global.sh b/ci_build_global.sh
index 911e494..42c5c5a 100644
--- a/ci_build_global.sh
+++ b/ci_build_global.sh
@@ -7,6 +7,9 @@ wget -nc -nv -O android-ndk-$NDK_VERSION-linux-x86_64.zip "https://dl.google.com
 ./extractndk.sh
 ./getlibs.sh
 ./maketoolchain.sh
+
+# Some modifies to NDK to fix
+
 ./clonejdk.sh
 ./buildlibs.sh
 ./buildjdk.sh