Skip to content

Commit e54586b

Browse files
committed
Fix OP15 build
1 parent 12f683d commit e54586b

File tree

1 file changed

+18
-14
lines changed

1 file changed

+18
-14
lines changed

.github/actions/action.yml

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ runs:
354354
RUSTC_FOUND=false
355355
for base in "$KP/prebuilts" "$KP/prebuilts-master"; do
356356
[ -d "$base/clang/host/linux-x86" ] || continue
357-
latest=$(ls -d "$base"/clang/host/linux-x86/clang-r*/ 2>/dev/null | sort -V | head -n1 || true)
357+
latest=$(ls -d "$base"/clang/host/linux-x86/clang-r*/ 2>/dev/null | sort -V | tail -n1 || true)
358358
if [ -n "$latest" ] && [ -x "$latest/bin/clang" ]; then
359359
CLANG_BIN="$latest/bin"
360360
CLANG_FOUND=true
@@ -608,6 +608,7 @@ runs:
608608
cd "$CONFIG/kernel_platform"
609609
rm -f common/android/abi_gki_protected_exports_* || true
610610
rm -f msm-kernel/android/abi_gki_protected_exports_* || true
611+
sed -i 's/protected_modules = \[.*\]/protected_modules = []/' common/modules.bzl || true
611612
df -h
612613
613614
- name: Add BBG
@@ -1046,19 +1047,24 @@ runs:
10461047
sed -i 's/CONFIG_LTO=n/CONFIG_LTO=y/' "./common/arch/arm64/configs/gki_defconfig"
10471048
sed -i 's/CONFIG_LTO_CLANG_FULL=y/CONFIG_LTO_CLANG_NONE=y/' "./common/arch/arm64/configs/gki_defconfig"
10481049
sed -i 's/CONFIG_LTO_CLANG_THIN=y/CONFIG_LTO_CLANG_NONE=y/' "./common/arch/arm64/configs/gki_defconfig"
1049-
echo "CONFIG_ANDROID_BINDER_IPC_RUST=m" >> ./common/arch/arm64/configs/gki_defconfig
1050-
echo "CONFIG_LOCALVERSION=\"-OP-Wild\"" >> ./common/arch/arm64/configs/gki_defconfig
1050+
cat >> ./common/arch/arm64/configs/gki_defconfig <<EOF
1051+
CONFIG_TCP_CONG_BIC=n
1052+
CONFIG_TCP_CONG_WESTWOOD=n
1053+
CONFIG_TCP_CONG_HTCP=n
1054+
CONFIG_LOCALVERSION="-OP-Wild"
1055+
CONFIG_ANDROID_BINDER_IPC_RUST=m
1056+
EOF
10511057
1052-
sed -i '/_ARM64_GKI_MODULES_LIST = \[/,/\]/ {
1053-
/\]/i\
1054-
"net/ipv4/tcp_bic.ko",\
1055-
"net/ipv4/tcp_htcp.ko",\
1056-
"net/ipv4/tcp_westwood.ko",
1057-
}' ./common/modules.bzl
1058+
# sed -i '/_ARM64_GKI_MODULES_LIST = \[/,/\]/ {
1059+
# /\]/i\
1060+
# "net/ipv4/tcp_bic.ko",\
1061+
# "net/ipv4/tcp_htcp.ko",\
1062+
# "net/ipv4/tcp_westwood.ko",
1063+
# }' ./common/modules.bzl
10581064
1059-
sed -i "s/$(printf '\044'){{kernelrelease}}/\"$(printf '\044'){{kernelrelease}}\"/g" ./build/kernel/kleaf/impl/kernel_modules_install.bzl
1060-
sed -i -e '/_GKI_AARCH64_MAKE_GOALS/,/]/ s/"modules",\?//g' -e '/_GKI_AARCH64_MAKE_GOALS/,/]/ {/^[[:space:]]*$/d}' -e 's/module_implicit_outs = get_gki_modules_list("arm64") + get_kunit_modules_list("arm64")/module_implicit_outs = []/' common/BUILD.bazel
1061-
sed -i -e 's/":tests_zip_arm64",//' -e '/extra_dist/,/]/ {/^[[:space:]]*$/d}' -e 's/kmi_enforced = True,/kmi_enforced = False,/' -e 's/kmi_symbol_list_strict_mode = True,/kmi_symbol_list_strict_mode = False,/' -e 's/trim_nonlisted_kmi = True,/trim_nonlisted_kmi = False,/' common/BUILD.bazel
1065+
# sed -i "s/$(printf '\044'){{kernelrelease}}/\"$(printf '\044'){{kernelrelease}}\"/g" ./build/kernel/kleaf/impl/kernel_modules_install.bzl
1066+
# sed -i -e '/_GKI_AARCH64_MAKE_GOALS/,/]/ s/"modules",\?//g' -e '/_GKI_AARCH64_MAKE_GOALS/,/]/ {/^[[:space:]]*$/d}' -e 's/module_implicit_outs = get_gki_modules_list("arm64") + get_kunit_modules_list("arm64")/module_implicit_outs = []/' common/BUILD.bazel
1067+
# sed -i -e 's/":tests_zip_arm64",//' -e '/extra_dist/,/]/ {/^[[:space:]]*$/d}' -e 's/kmi_enforced = True,/kmi_enforced = False,/' -e 's/kmi_symbol_list_strict_mode = True,/kmi_symbol_list_strict_mode = False,/' -e 's/trim_nonlisted_kmi = True,/trim_nonlisted_kmi = False,/' common/BUILD.bazel
10621068
10631069
# Run sed commands for modifications
10641070
sed -i 's/check_defconfig//' ./common/build.config.gki
@@ -1087,8 +1093,6 @@ runs:
10871093
# Clear Cache
10881094
sudo sh -c 'sync; echo 3 > /proc/sys/vm/drop_caches'
10891095
1090-
rm ./kernel_platform/common/android/abi_gki_protected_exports_* || echo "No protected exports!"
1091-
10921096
(stdbuf -oL bash -c '
10931097
while true; do
10941098
echo "=== $(date) ==="

0 commit comments

Comments
 (0)