Skip to content

Commit 0d14a95

Browse files
authored
Merge branch 'topnotchfreaks:builder' into builder
2 parents 62e780e + 93311b5 commit 0d14a95

1 file changed

Lines changed: 13 additions & 64 deletions

File tree

‎.github/workflows/advanced_build.yml‎

Lines changed: 13 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ on:
6262
type: choice
6363
default: "O2"
6464
options:
65+
- "default"
6566
- "O2"
6667
- "O3"
6768
- "Os"
@@ -123,20 +124,21 @@ jobs:
123124
rm -rf common
124125

125126
# Download updated Clang r584948 from Android Git repository
126-
aria2c -x 16 -s 16 -o prebuilts/clang/host/linux-x86/clang-r547379.tar.gz "https://github.com/topnotchfreaks/clang/releases/download/v1.0.0/clang-r547379.tar.gz"
127+
aria2c -x 16 -s 16 -o prebuilts/clang/host/linux-x86/clang-r584948b.tar.gz "https://github.com/topnotchfreaks/clang/releases/download/v1.0.0/clang-r584948b.tar.gz"
127128

128-
mkdir -p prebuilts/clang/host/linux-x86/clang-r547379
129-
tar -xzf prebuilts/clang/host/linux-x86/clang-r547379.tar.gz -C prebuilts/clang/host/linux-x86/clang-r547379
130-
rm -rf prebuilts/clang/host/linux-x86/clang-r547379.tar.gz
129+
mkdir -p prebuilts/clang/host/linux-x86/clang-r584948b
130+
tar -xzf prebuilts/clang/host/linux-x86/clang-r584948b.tar.gz -C prebuilts/clang/host/linux-x86/clang-r584948b
131+
rm -rf prebuilts/clang/host/linux-x86/clang-r584948b.tar.gz
131132

132133
# Clean up old Clang versions
133134
rm -rf prebuilts/clang/host/linux-x86/clang-3289846
134135
rm -rf prebuilts/clang/host/linux-x86/clang-r450784e
136+
rm -rf prebuilts/clang/host/linux-x86/clang-r547379
135137
rm -rf prebuilts/clang/host/linux-x86/clang-stable
136138

137139
sed -i \
138140
-e 's/^BRANCH=.*/BRANCH=android13-5.15/' \
139-
-e 's/^CLANG_VERSION=.*/CLANG_VERSION=r547379/' \
141+
-e 's/^CLANG_VERSION=.*/CLANG_VERSION=r584948b/' \
140142
${{ env.kernelDir }}/${{ env.kernelName }}/build.config.constants
141143

142144
sed -i '/^DEFCONFIG=gki_defconfig/d' ${{ env.kernelDir }}/${{ env.kernelName }}/build.config.gki
@@ -251,17 +253,8 @@ jobs:
251253
args="$args AR=llvm-ar"
252254
args="$args CC=clang"
253255
echo "args=$args" >> $GITHUB_OUTPUT
254-
255-
- name: "📝 Append custom Makefile line AOSP"
256-
if: github.event.inputs.buildToolchains == 'android-tools'
257-
working-directory: ./${{ env.kernelDir }}/${{ env.kernelName }}
258-
run: |
259-
echo 'KBUILD_CFLAGS += -Wno-implicit-function-declaration' >> Makefile
260-
echo 'KBUILD_CFLAGS += -Wno-sometimes-uninitialized' >> Makefile
261-
echo "Custom Makefile line added successfully"
262256
263257
- name: "📝 Append custom Makefile line CUSTOM"
264-
if: github.event.inputs.buildToolchains == 'custom-tools'
265258
working-directory: ./${{ env.kernelDir }}/${{ env.kernelName }}
266259
run: |
267260
echo 'KBUILD_CFLAGS += -Wno-default-const-init-unsafe' >> Makefile
@@ -312,6 +305,9 @@ jobs:
312305

313306
# Apply selected optimization level
314307
case "${{ github.event.inputs.optimizationLevel }}" in
308+
default)
309+
# nothing to add here (keep it default)
310+
;;
315311
O2)
316312
echo "CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y" >> "$CONFIG_FILE"
317313
echo "# CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3 is not set" >> "$CONFIG_FILE"
@@ -332,7 +328,7 @@ jobs:
332328
# Apply selected tick rate
333329
case "${{ github.event.inputs.tickRate }}" in
334330
default)
335-
echo Nothing to change. Keep Default.
331+
# nothing to add here (keep it default)
336332
;;
337333
100Hz)
338334
sed -i '/^CONFIG_HZ_100=/d' "$CONFIG_FILE"
@@ -379,55 +375,9 @@ jobs:
379375
# localversion
380376
# curl -L -o localversion.patch "https://raw.githubusercontent.com/topnotchfreaks/kernel_patches/main/0001-scripts-do-not-ship-full-auto_localversion.patch"
381377
# patch -p1 < localversion.patch || echo "Warning: Strings patch failed"
382-
383-
- name: "🔧 Setup SukiSU-Ultra (Stable)"
384-
if: matrix.variant == 'ksu' && github.event.inputs.ksuVariant == 'sukisu-ultra'
385-
working-directory: ./${{ env.kernelDir }}/${{ env.kernelName }}
386-
run: |
387-
rm -rf ./KernelSU ./drivers/kernelsu
388-
389-
# Install SukiSU-Ultra with SUSFS
390-
curl -LSs "https://raw.githubusercontent.com/ShirkNeko/SukiSU-Ultra/main/kernel/setup.sh" | bash -s builtin
391-
392-
# Apply SUSFS patch
393-
PATCH_URL="https://api.github.com/repos/topnotchfreaks/kernel_patches/releases/latest"
394-
SUSFS_PATCH=$(curl -s "$PATCH_URL" | grep "browser_download_url.*0001-Implement-SUSFS.*Android-13.*Kernel-5.15.*patch" | cut -d '"' -f 4 | head -n 1)
395-
396-
if [ -n "$SUSFS_PATCH" ]; then
397-
curl -L -o susfs.patch "$SUSFS_PATCH"
398-
patch -p1 < susfs.patch || echo "Warning: SUSFS patch failed"
399-
fi
400-
401-
# Add KSU configs
402-
CONFIG_FILE="arch/arm64/configs/${{ env.DEFCONFIG_NAME }}"
403-
cat >> "$CONFIG_FILE" << 'EOF'
404-
CONFIG_KSU=y
405-
# CONFIG_KSU_MANUAL_HOOK is not set
406-
CONFIG_KPM=y
407-
CONFIG_KSU_SUSFS=y
408-
CONFIG_KSU_SUSFS_HAS_MAGIC_MOUNT=y
409-
CONFIG_KSU_SUSFS_SUS_PATH=y
410-
CONFIG_KSU_SUSFS_SUS_MOUNT=y
411-
CONFIG_KSU_SUSFS_AUTO_ADD_SUS_KSU_DEFAULT_MOUNT=y
412-
CONFIG_KSU_SUSFS_AUTO_ADD_SUS_BIND_MOUNT=y
413-
CONFIG_KSU_SUSFS_SUS_KSTAT=y
414-
CONFIG_KSU_SUSFS_SUS_OVERLAYFS=n
415-
CONFIG_KSU_SUSFS_TRY_UMOUNT=y
416-
CONFIG_KSU_SUSFS_AUTO_ADD_TRY_UMOUNT_FOR_BIND_MOUNT=y
417-
CONFIG_KSU_SUSFS_SPOOF_UNAME=y
418-
CONFIG_KSU_SUSFS_ENABLE_LOG=y
419-
CONFIG_KSU_SUSFS_HIDE_KSU_SUSFS_SYMBOLS=y
420-
CONFIG_KSU_SUSFS_SPOOF_CMDLINE_OR_BOOTCONFIG=y
421-
CONFIG_KSU_SUSFS_OPEN_REDIRECT=y
422-
CONFIG_KSU_SUSFS_SUS_SU=y
423-
CONFIG_TMPFS_XATTR=y
424-
CONFIG_TMPFS_POSIX_ACL=y
425-
EOF
426-
427-
echo "✅ Installed SukiSU-Ultra with SUSFS"
428378

429379
- name: "🔧 Setup Wild KSU with SUSFS"
430-
if: matrix.variant == 'ksu' && github.event.inputs.ksuVariant == 'wildksu'
380+
if: matrix.variant == 'ksu'
431381
working-directory: ./${{ env.kernelDir }}/${{ env.kernelName }}
432382
run: |
433383
rm -rf ./KernelSU ./drivers/kernelsu
@@ -541,7 +491,6 @@ jobs:
541491
run: |
542492
make ${args} \
543493
LLVM=1 \
544-
LTO=thin \
545494
CC=clang \
546495
AR=llvm-ar \
547496
NM=llvm-nm \
@@ -550,7 +499,7 @@ jobs:
550499
-j$(nproc --all)
551500
552501
- name: "🩹 Apply KPM patch (SukiSU-Ultra only)"
553-
if: matrix.variant == 'ksu' && github.event.inputs.ksuVariant == 'sukisu-ultra'
502+
if: matrix.variant == 'ksu'
554503
working-directory: ${{ env.WORK_DIR }}/out/dist
555504
run: |
556505
curl -LSs "https://raw.githubusercontent.com/SukiSU-Ultra/SukiSU_patch/refs/heads/main/kpm/patch_linux" -o patch

0 commit comments

Comments
 (0)