Skip to content

Commit 94d0715

Browse files
fatalcoder524fatalcoder524
committed
Make some changes 9
1 parent 1f4b8be commit 94d0715

File tree

2 files changed

+61
-62
lines changed

2 files changed

+61
-62
lines changed

‎.github/actions/action.yml‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1190,21 +1190,21 @@ runs:
11901190
export HOSTCC="ccache clang"
11911191
export HOSTCXX="ccache clang++"
11921192
1193-
export RUSTC_FORCE_RUSTC_VERSION=rustc-android
1194-
export HOSTRUSTFLAGS="--target x86_64-unknown-linux-gnu"
1195-
export KBUILD_SYMTYPES=
1193+
# export RUSTC_FORCE_RUSTC_VERSION=rustc-android
1194+
# export HOSTRUSTFLAGS="--target x86_64-unknown-linux-gnu"
1195+
# export KBUILD_SYMTYPES=
11961196
export DEPMOD="$KERNEL_PATH/build/prebuilts/kernel-build-tools/linux-x86/bin/depmod"
11971197
export DTC="$KERNEL_PATH/build/prebuilts/kernel-build-tools/linux-x86/bin/dtc"
1198-
export PROCMACROLDFLAGS="-fuse-ld=lld --rtlib=compiler-rt --sysroot=$KERNEL_PATH/build/kernel/build-tools/sysroot"
1199-
export BRANCH=android16-6.12
1200-
export KMI_GENERATION=5
1201-
export CLANG_VERSION=r536225
1202-
export RUSTC_VERSION=1.82.0
1203-
export AARCH64_NDK_TRIPLE=aarch64-linux-android31
1204-
export X86_64_NDK_TRIPLE=x86_64-linux-android31
1205-
export ARM_NDK_TRIPLE=arm-linux-androideabi31
1206-
1207-
export LLVM=1
1198+
# export PROCMACROLDFLAGS="-fuse-ld=lld --rtlib=compiler-rt --sysroot=$KERNEL_PATH/build/kernel/build-tools/sysroot"
1199+
# export BRANCH=android16-6.12
1200+
# export KMI_GENERATION=5
1201+
# export CLANG_VERSION=r536225
1202+
# export RUSTC_VERSION=1.82.0
1203+
# export AARCH64_NDK_TRIPLE=aarch64-linux-android31
1204+
# export X86_64_NDK_TRIPLE=x86_64-linux-android31
1205+
# export ARM_NDK_TRIPLE=arm-linux-androideabi31
1206+
1207+
export LLVM=1 LLVM_IAS=1
12081208
export ARCH=arm64 SUBARCH=arm64
12091209
export CROSS_COMPILE=aarch64-linux-gnu-
12101210
export PAHOLE="$KERNEL_PATH/prebuilts/kernel-build-tools/linux-x86/bin/pahole"
@@ -1256,12 +1256,11 @@ runs:
12561256
fi
12571257
echo "============================================"
12581258
1259-
set +u
1260-
source "$KERNEL_PATH/build/kernel/_setup_env.sh" 2>/dev/null || true
1261-
set -u
1259+
# set +u
1260+
# source "$KERNEL_PATH/build/kernel/_setup_env.sh" 2>/dev/null || true
1261+
# set -u
12621262
12631263
make O="$OUT" gki_defconfig
1264-
make LLVM=1 rustavailable
12651264
12661265
if [ -n "${CUSTOM_LOCALVERSION:-}" ]; then
12671266
scripts/config --file "$OUT/.config" --set-str LOCALVERSION "${CUSTOM_LOCALVERSION}"
@@ -1282,31 +1281,31 @@ runs:
12821281
scripts/config --file "$OUT/.config" -e LTO_CLANG_NONE
12831282
scripts/config --file "$OUT/.config" -d LTO_CLANG_THIN
12841283
scripts/config --file "$OUT/.config" -d LTO_CLANG_FULL
1285-
scripts/config --file "$OUT/.config" -d TCP_CONG_BIC
1286-
scripts/config --file "$OUT/.config" -d TCP_CONG_WESTWOOD
1287-
scripts/config --file "$OUT/.config" -d CONFIG_TCP_CONG_HTCP
1284+
# scripts/config --file "$OUT/.config" -d TCP_CONG_BIC
1285+
# scripts/config --file "$OUT/.config" -d TCP_CONG_WESTWOOD
1286+
# scripts/config --file "$OUT/.config" -d CONFIG_TCP_CONG_HTCP
12881287
scripts/config --file "$OUT/.config" -d GENKSYMS
12891288
scripts/config --file "$OUT/.config" -m ANDROID_BINDER_IPC_RUST
12901289
scripts/config --file "$OUT/.config" -e RUST
12911290
scripts/config --file "$OUT/.config" -e GENDWARFKSYMS
1292-
scripts/config --file "$OUT/.config" -e EXTENDED_MODVERSIONS
1293-
scripts/config --file "$OUT/.config" -e CFI_ICALL_NORMALIZE_INTEGERS
1291+
# scripts/config --file "$OUT/.config" -e EXTENDED_MODVERSIONS
1292+
# scripts/config --file "$OUT/.config" -e CFI_ICALL_NORMALIZE_INTEGERS
12941293
1295-
scripts/config --file "$OUT/.config" -d TRIM_UNUSED_KSYMS
1296-
scripts/config --file "$OUT/.config" -e MODULE_ALLOW_BTF_MISMATCH
1297-
scripts/config --file "$OUT/.config" --set-str MODULE_SIG_PROTECT_LIST ""
1298-
scripts/config --file "$OUT/.config" -d MODULE_SIG_PROTECT
1299-
scripts/config --file "$OUT/.config" -d MODULE_SCMVERSION
1294+
# scripts/config --file "$OUT/.config" -d TRIM_UNUSED_KSYMS
1295+
# scripts/config --file "$OUT/.config" -e MODULE_ALLOW_BTF_MISMATCH
1296+
# scripts/config --file "$OUT/.config" --set-str MODULE_SIG_PROTECT_LIST ""
1297+
# scripts/config --file "$OUT/.config" -d MODULE_SIG_PROTECT
1298+
# scripts/config --file "$OUT/.config" -d MODULE_SCMVERSION
13001299
13011300
make O="$OUT" olddefconfig
13021301
13031302
cat "$OUT/.config"
13041303
13051304
./scripts/rust_is_available.sh
13061305
1307-
KCFLAGS="$KCFLAGS -Wno-error -pipe ${KCFLAGS_EXTRA}"
1306+
KCFLAGS="$KCFLAGS -Wno-error -pipe -fno-stack-protector ${KCFLAGS_EXTRA}"
13081307
KCPPFLAGS="$KCPPFLAGS -DCONFIG_OPTIMIZE_INLINING"
1309-
# -fno-stack-protector
1308+
13101309
echo "============================================"
13111310
echo "🔧 Build Configuration"
13121311
echo "============================================"

‎manifests/oos16/oneplus_15_w.xml‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -13,45 +13,45 @@
1313

1414
<project remote="origin" name="android_kernel_modules_and_devicetree_oneplus_sm8850" path="./" revision="oneplus/sm8850_b_16.0.0_oneplus_15" clone-depth="1"/>
1515

16-
<project remote="aosp" name="platform/build/bazel_common_rules" path="kernel_platform/build/bazel_common_rules" revision="65f7a037277610bad11048a53548abc2b40b4fbe" clone-depth="1" groups="ddk"/>
17-
<project remote="aosp" name="platform/external/bazel-contrib-bazel_features" path="kernel_platform/external/bazel-contrib-bazel_features" clone-depth="1" groups="ddk-external"/>
18-
<project remote="aosp" name="platform/external/bazel-skylib" path="kernel_platform/external/bazel-skylib" clone-depth="1" groups="ddk-external"/>
19-
<project remote="aosp" name="platform/external/bazelbuild-bazel-central-registry" path="kernel_platform/external/bazelbuild-bazel-central-registry" clone-depth="1" groups="ddk-external"/>
20-
<project remote="aosp" name="platform/external/bazelbuild-platforms" path="kernel_platform/external/bazelbuild-platforms" clone-depth="1" groups="ddk-external"/>
21-
<project remote="aosp" name="platform/external/bazelbuild-rules_cc" path="kernel_platform/external/bazelbuild-rules_cc" clone-depth="1" groups="ddk-external"/>
22-
<project remote="aosp" name="platform/external/bazelbuild-rules_license" path="kernel_platform/external/bazelbuild-rules_license" clone-depth="1" groups="ddk-external"/>
23-
<project remote="aosp" name="platform/external/bazelbuild-rules_pkg" path="kernel_platform/external/bazelbuild-rules_pkg" clone-depth="1" groups="ddk-external"/>
24-
<project remote="aosp" name="platform/external/bazelbuild-rules_python" path="kernel_platform/external/bazelbuild-rules_python" clone-depth="1" groups="ddk-external"/>
25-
<project remote="aosp" name="platform/external/bazelbuild-rules_rust" path="kernel_platform/external/bazelbuild-rules_rust" clone-depth="1" groups="ddk-external" />
26-
<project remote="aosp" name="platform/external/bazelbuild-rules_shell" path="kernel_platform/external/bazelbuild-rules_shell" clone-depth="1" groups="ddk-external"/>
27-
<project remote="aosp" name="platform/external/dtc" path="kernel_platform/external/qcom-dtc" clone-depth="1"/>
28-
<project remote="aosp" name="platform/external/lz4" path="kernel_platform/external/lz4" clone-depth="1" groups="ddk"/>
29-
<project remote="aosp" name="platform/external/pigz" path="kernel_platform/external/pigz" clone-depth="1" groups="ddk"/>
30-
<project remote="aosp" name="platform/external/python/absl-py" path="kernel_platform/external/python/absl-py" clone-depth="1" groups="ddk-external"/>
31-
<project remote="aosp" name="platform/external/toybox" path="kernel_platform/external/toybox" clone-depth="1" groups="ddk"/>
32-
<project remote="aosp" name="platform/external/zlib" path="kernel_platform/external/zlib" clone-depth="1" groups="ddk"/>
33-
<project remote="aosp" name="platform/external/zopfli" path="kernel_platform/external/zopfli" clone-depth="1" groups="ddk"/>
16+
<!-- <project remote="aosp" name="platform/build/bazel_common_rules" path="kernel_platform/build/bazel_common_rules" revision="65f7a037277610bad11048a53548abc2b40b4fbe" clone-depth="1" groups="ddk"/> -->
17+
<!-- <project remote="aosp" name="platform/external/bazel-contrib-bazel_features" path="kernel_platform/external/bazel-contrib-bazel_features" clone-depth="1" groups="ddk-external"/> -->
18+
<!-- <project remote="aosp" name="platform/external/bazel-skylib" path="kernel_platform/external/bazel-skylib" clone-depth="1" groups="ddk-external"/> -->
19+
<!-- <project remote="aosp" name="platform/external/bazelbuild-bazel-central-registry" path="kernel_platform/external/bazelbuild-bazel-central-registry" clone-depth="1" groups="ddk-external"/> -->
20+
<!-- <project remote="aosp" name="platform/external/bazelbuild-platforms" path="kernel_platform/external/bazelbuild-platforms" clone-depth="1" groups="ddk-external"/> -->
21+
<!-- <project remote="aosp" name="platform/external/bazelbuild-rules_cc" path="kernel_platform/external/bazelbuild-rules_cc" clone-depth="1" groups="ddk-external"/> -->
22+
<!-- <project remote="aosp" name="platform/external/bazelbuild-rules_license" path="kernel_platform/external/bazelbuild-rules_license" clone-depth="1" groups="ddk-external"/> -->
23+
<!-- <project remote="aosp" name="platform/external/bazelbuild-rules_pkg" path="kernel_platform/external/bazelbuild-rules_pkg" clone-depth="1" groups="ddk-external"/> -->
24+
<!-- <project remote="aosp" name="platform/external/bazelbuild-rules_python" path="kernel_platform/external/bazelbuild-rules_python" clone-depth="1" groups="ddk-external"/> -->
25+
<!-- <project remote="aosp" name="platform/external/bazelbuild-rules_rust" path="kernel_platform/external/bazelbuild-rules_rust" clone-depth="1" groups="ddk-external" /> -->
26+
<!-- <project remote="aosp" name="platform/external/bazelbuild-rules_shell" path="kernel_platform/external/bazelbuild-rules_shell" clone-depth="1" groups="ddk-external"/> -->
27+
<!-- <project remote="aosp" name="platform/external/dtc" path="kernel_platform/external/qcom-dtc" clone-depth="1"/> -->
28+
<!-- <project remote="aosp" name="platform/external/lz4" path="kernel_platform/external/lz4" clone-depth="1" groups="ddk"/> -->
29+
<!-- <project remote="aosp" name="platform/external/pigz" path="kernel_platform/external/pigz" clone-depth="1" groups="ddk"/> -->
30+
<!-- <project remote="aosp" name="platform/external/python/absl-py" path="kernel_platform/external/python/absl-py" clone-depth="1" groups="ddk-external"/> -->
31+
<!-- <project remote="aosp" name="platform/external/toybox" path="kernel_platform/external/toybox" clone-depth="1" groups="ddk"/> -->
32+
<!-- <project remote="aosp" name="platform/external/zlib" path="kernel_platform/external/zlib" clone-depth="1" groups="ddk"/> -->
33+
<!-- <project remote="aosp" name="platform/external/zopfli" path="kernel_platform/external/zopfli" clone-depth="1" groups="ddk"/> -->
3434

35-
<project remote="aosp" name="platform/prebuilts/jdk/jdk11" path="kernel_platform/prebuilts/jdk/jdk11" clone-depth="1"/>
36-
<project remote="aosp" name="platform/system/libufdt" path="kernel_platform/external/libufdt" clone-depth="1"/>
37-
<project remote="aosp" name="platform/system/tools/mkbootimg" path="kernel_platform/tools/mkbootimg" clone-depth="1"/>
38-
<project remote="aosp" name="toolchain/prebuilts/ndk/r26" path="kernel_platform/prebuilts/ndk-r26" clone-depth="1" groups="ddk"/>
39-
<project remote="aosp" name="platform/tools/tradefederation/prebuilts" path="kernel_platform/prebuilts/tradefed" clone-depth="1"/>
35+
<!-- <project remote="aosp" name="platform/prebuilts/jdk/jdk11" path="kernel_platform/prebuilts/jdk/jdk11" clone-depth="1"/> -->
36+
<!-- <project remote="aosp" name="platform/system/libufdt" path="kernel_platform/external/libufdt" clone-depth="1"/> -->
37+
<!-- <project remote="aosp" name="platform/system/tools/mkbootimg" path="kernel_platform/tools/mkbootimg" clone-depth="1"/> -->
38+
<!-- <project remote="aosp" name="toolchain/prebuilts/ndk/r26" path="kernel_platform/prebuilts/ndk-r26" clone-depth="1" groups="ddk"/> -->
39+
<!-- <project remote="aosp" name="platform/tools/tradefederation/prebuilts" path="kernel_platform/prebuilts/tradefed" clone-depth="1"/> -->
4040

41-
<project remote="aosp" name="platform/external/libcap-ng" path="kernel_platform/external/libcap-ng" clone-depth="1"/>
42-
<project remote="aosp" name="platform/external/libcap" path="kernel_platform/external/libcap" clone-depth="1"/>
41+
<!-- <project remote="aosp" name="platform/external/libcap-ng" path="kernel_platform/external/libcap-ng" clone-depth="1"/> -->
42+
<!-- <project remote="aosp" name="platform/external/libcap" path="kernel_platform/external/libcap" clone-depth="1"/> -->
4343

44-
<project remote="aosp" name="kernel/common-modules/trusty" path="kernel_platform/common-modules/trusty" clone-depth="1"/>
44+
<!-- <project remote="aosp" name="kernel/common-modules/trusty" path="kernel_platform/common-modules/trusty" clone-depth="1"/> -->
4545
<project remote="aosp" name="kernel/prebuilts/build-tools" path="kernel_platform/prebuilts/kernel-build-tools" clone-depth="1" groups="ddk">
4646
<linkfile dest="kernel_platform/build/prebuilts/kernel-build-tools" src="."/>
4747
</project>
48-
<project remote="aosp" name="platform/prebuilts/asuite" path="kernel_platform/prebuilts/asuite" clone-depth="1"/>
49-
<project remote="aosp" name="platform/prebuilts/build-tools" path="kernel_platform/prebuilts/build-tools" clone-depth="1" groups="ddk">
50-
<linkfile dest="kernel_platform/build/prebuilts/build-tools" src="."/>
51-
</project>
52-
<project remote="aosp" name="platform/prebuilts/clang-tools" path="kernel_platform/prebuilts/clang-tools" clone-depth="1" groups="ddk">
53-
<linkfile dest="kernel_platform/build/prebuilts/clang-tools" src="."/>
54-
</project>
48+
<!-- <project remote="aosp" name="platform/prebuilts/asuite" path="kernel_platform/prebuilts/asuite" clone-depth="1"/> -->
49+
<!-- <project remote="aosp" name="platform/prebuilts/build-tools" path="kernel_platform/prebuilts/build-tools" clone-depth="1" groups="ddk"> -->
50+
<!-- <linkfile dest="kernel_platform/build/prebuilts/build-tools" src="."/> -->
51+
<!-- </project> -->
52+
<!-- <project remote="aosp" name="platform/prebuilts/clang-tools" path="kernel_platform/prebuilts/clang-tools" clone-depth="1" groups="ddk"> -->
53+
<!-- <linkfile dest="kernel_platform/build/prebuilts/clang-tools" src="."/> -->
54+
<!-- </project> -->
5555
<project remote="aosp" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" path="kernel_platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" clone-depth="1" groups="ddk">
5656
<linkfile dest="kernel_platform/build/build-tools/sysroot" src="sysroot"/>
5757
</project>

0 commit comments

Comments
 (0)