aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishal Bhoj <vishal.bhoj@linaro.org>2019-01-24 21:44:22 +0530
committerVishal Bhoj <vishal.bhoj@linaro.org>2019-01-24 16:16:26 +0000
commit1d287d95a2e71637ddba71ce2f236ed9141cff8b (patch)
treec820a45959337c5262a9a1e304a0859f67a04b61
parentce68b389541fc5de77ba09c45b7789ceddf92e4f (diff)
Revert "use clang and image.gz-dtb"
This reverts commit 45bbc63324dd48b45b2e3ffbc97915c594954053. Change-Id: I0d676e57fe7abf143368fff021f3b00f91a4d4f6
-rw-r--r--android-hikey-linaro-4.14-pmwg/builders.sh11
1 files changed, 4 insertions, 7 deletions
diff --git a/android-hikey-linaro-4.14-pmwg/builders.sh b/android-hikey-linaro-4.14-pmwg/builders.sh
index def1cd765b..9eba1448fa 100644
--- a/android-hikey-linaro-4.14-pmwg/builders.sh
+++ b/android-hikey-linaro-4.14-pmwg/builders.sh
@@ -2,11 +2,8 @@
set -ex
-git clone --depth=1 https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86
-export PATH=${PWD}/aarch64-linux-android-4.9/bin/:${PWD}/linux-x86/clang-r328903/bin/:${PATH}
-export CLANG_TRIPLE=aarch64-linux-gnu-
-export CROSS_COMPILE=aarch64-linux-android-
-
+git clone --depth=1 https://android.googlesource.com/platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9
+export PATH=${PATH}:${PWD}/aarch64-linux-android-4.9/bin/
if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update; then
echo "INFO: apt update error - try again in a moment"
@@ -20,8 +17,8 @@ if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}; th
sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}
fi
-make ARCH=arm64 CC=clang HOSTCC=clang ${DEFCONFIG}
-make ARCH=arm64 CC=clang HOSTCC=clang -j$(nproc) -s Image.gz-dtb
+make ARCH=arm64 ${DEFCONFIG}
+make ARCH=arm64 CROSS_COMPILE=aarch64-linux-android- -j$(nproc) -s Image.gz-dtb
wget -q https://android-git.linaro.org/platform/system/core.git/plain/mkbootimg/mkbootimg.py -O mkbootimg
wget -q ${REFERENCE_BUILD_URL}/ramdisk.img -O ramdisk.img