From 536bb5a56621828dff05aecded2f7019b1a9181b Mon Sep 17 00:00:00 2001
From: Anan Jaser <ananjaser@gmail.com>
Date: Sat, 27 Jul 2024 04:28:59 +0400
Subject: [PATCH] apollo: update and add new compilers

* simplify pkg checker
* add new clang versions
* update debug build
* fix invalid char
---
 apollo.sh | 68 +++++++++++++++++++++++++++++++++----------------------
 1 file changed, 41 insertions(+), 27 deletions(-)

diff --git a/apollo.sh b/apollo.sh
index ece6dfd2f6a4..caed48fdd872 100755
--- a/apollo.sh
+++ b/apollo.sh
@@ -76,7 +76,10 @@ CR_GCC4=~/Android/Toolchains/aarch64-linux-android-4.9/bin/aarch64-linux-android
 CR_GCC9=~/Android/Toolchains/aarch64-linux-gnu-9.x/bin/aarch64-linux-gnu-
 CR_GCC12=~/Android/Toolchains/aarch64-linux-gnu-12.x/bin/aarch64-linux-gnu-
 CR_GCC13=~/Android/Toolchains/aarch64-linux-gnu-13.x/bin/aarch64-linux-gnu-
-CR_CLANG=~/Android/Toolchains/clang-r383902-jopp
+CR_CLANG_11=~/Android/Toolchains/clang-r383902-jopp
+CR_CLANG_12=~/Android/Toolchains/clang-r416183b
+CR_CLANG_14=~/Android/Toolchains/clang-r450784d
+CR_CLANG_EXP=~/Android/Toolchains/clang-r522817
 #####################################################
 
 # Compiler Selection
@@ -102,32 +105,40 @@ export CROSS_COMPILE=$CR_GCC13
 compile="make"
 CR_COMPILER="$CR_GCC13"
 fi
-if [ $CR_COMPILER = "5" ]; then
-# Check packages
-if ! dpkg-query -W -f='${Status}' gcc-arm-linux-gnueabi  | grep "ok installed"; then
-	echo " gcc-arm-linux-gnueabi is missing, please install with sudo apt-get install gcc-arm-linux-gnueabi"
-	exit 0;
-fi
+if [ $CR_COMPILER = "5" ] || [ $CR_COMPILER = "6" ] || [ $CR_COMPILER = "7" ] || [ $CR_COMPILER = "8" ]; then
+    if [ $CR_COMPILER = "5" ]; then
+        CR_CLANG=$CR_CLANG_11
+    elif [ $CR_COMPILER = "6" ]; then
+        CR_CLANG=$CR_CLANG_12
+    elif [ $CR_COMPILER = "7" ]; then
+        CR_CLANG=$CR_CLANG_14
+    elif [ $CR_COMPILER = "8" ]; then
+        CR_CLANG=$CR_CLANG_EXP
+    fi
+
 # Check packages
-if ! dpkg-query -W -f='${Status}' gcc-aarch64-linux-gnu  | grep "ok installed"; then
-	echo " gcc-aarch64-linux-gnu is missing, please install with sudo apt-get install gcc-aarch64-linux-gnu"
-	exit 0;
+for pkg in gcc-arm-linux-gnueabi gcc-aarch64-linux-gnu; do
+if ! dpkg-query -W -f='${Status}' $pkg | grep "ok installed"; then
+    echo " $pkg is missing, please install with sudo apt-get install $pkg"
+    exit 0;
 fi
+done
+
 export PATH=$CR_CLANG/bin:$CR_CLANG/lib:${PATH}
 export CLANG_TRIPLE=$CR_GCC9
 export CROSS_COMPILE=$CR_GCC9
 export CROSS_COMPILE_ARM32=arm-linux-gnueabi-
 export CC=$CR_CLANG/bin/clang
-#export REAL_CC=$CR_CLANG/bin/clang
-#export LD=$CR_CLANG/bin/ld.lld
-#export AR=$CR_CLANG/bin/llvm-ar
-#export NM=$CR_CLANG/bin/llvm-nm
-#export OBJCOPY=$CR_CLANG/bin/llvm-objcopy
-#export OBJDUMP=$CR_CLANG/bin/llvm-objdump
-#export READELF=$CR_CLANG/bin/llvm-readelf
-#export STRIP=$CR_CLANG/bin/llvm-strip
-#export LLVM=1
-#export LLVM_IAS=1
+export REAL_CC=$CR_CLANG/bin/clang
+export LD=$CR_CLANG/bin/ld.lld
+export AR=$CR_CLANG/bin/llvm-ar
+export NM=$CR_CLANG/bin/llvm-nm
+export OBJCOPY=$CR_CLANG/bin/llvm-objcopy
+export OBJDUMP=$CR_CLANG/bin/llvm-objdump
+export READELF=$CR_CLANG/bin/llvm-readelf
+export STRIP=$CR_CLANG/bin/llvm-strip
+export LLVM=1
+export LLVM_IAS=1
 export ARCH=arm64 && export SUBARCH=arm64
 compile="make ARCH=arm64 CC=clang"
 CR_COMPILER="$CR_CLANG"
@@ -301,7 +312,7 @@ PACK_BOOT_IMG()
         echo " Abort "
 	fi
 	# Remove red warning at boot
-	echo -n "SEANDROIDENFORCE" » $CR_AIK/image-new.img
+	echo -n "SEANDROIDENFORCE" >> $CR_AIK/image-new.img
 	# Copy boot.img to Production folder
 	if [ ! -e $CR_PRODUCT ]; then
         mkdir $CR_PRODUCT
@@ -413,14 +424,14 @@ BUILD_DEBUG(){
 echo "----------------------------------------------"
 echo " DEBUG : Debug build initiated "
 CR_TARGET=5
-CR_COMPILER=2
-CR_SELINUX=1
+CR_COMPILER=8
+CR_SELINUX=0
 CR_KSU="y"
 CR_CLEAN="n"
 echo " DEBUG : Set Build options "
 echo " DEBUG : Variant  : $CR_VARIANT_G965N"
-echo " DEBUG : Compiler : $CR_GCC9"
-echo " DEBUG : Selinux  : $CR_SELINUX Permissive"
+echo " DEBUG : Compiler : $CR_CLANG_EXP"
+echo " DEBUG : Selinux  : $CR_SELINUX Enforcing"
 echo " DEBUG : Clean    : $CR_CLEAN"
 echo "----------------------------------------------"
 BUILD
@@ -530,9 +541,12 @@ echo "1) $CR_GCC4 (GCC 4.9)"
 echo "2) $CR_GCC9 (GCC 9.x)" 
 echo "3) $CR_GCC12 (GCC 12.x)" 
 echo "4) $CR_GCC13 (GCC 13.x)" 
-echo "5) $CR_CLANG (CLANG 11)"
+echo "5) $CR_CLANG_11 (Clang 11 - Samsung)"
+echo "6) $CR_CLANG_12 (Clang 12)" 
+echo "7) $CR_CLANG_14 (Clang 14)"
+echo "8) $CR_CLANG_EXP (Clang 18)"
 echo " "
-read -p "Please select your compiler (1-5) > " CR_COMPILER
+read -p "Please select your compiler (1-8) > " CR_COMPILER
 echo " "
 echo "1) Selinux Permissive " "2) Selinux Enforcing"
 echo " "