Skip to content

Commit 63cc12f

Browse files
committed
Update compiler configs and manifest
1 parent 104d90e commit 63cc12f

28 files changed

+57
-3
lines changed

.github/actions/action.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -914,8 +914,9 @@ runs:
914914
915915
export LLVM=1 LLVM_IAS=1
916916
export ARCH=arm64 SUBARCH=arm64
917-
export CROSS_COMPILE=aarch64-linux-android-
918-
export CROSS_COMPILE_COMPAT=arm-linux-androideabi-
917+
export CROSS_COMPILE=aarch64-linux-gnu-
918+
export RUSTC="$KERNEL_PATH/prebuilts/rust/linux-x86/1.73.0b/bin/rustc"
919+
export PAHOLE="$KERNEL_PATH/prebuilts/kernel-build-tools/linux-x86/bin/pahole"
919920
export LD=ld.lld HOSTLD=ld.lld AR=llvm-ar NM=llvm-nm
920921
export OBJCOPY=llvm-objcopy OBJDUMP=llvm-objdump STRIP=llvm-strip
921922

configs/oos15/OP-NORD-5.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"model": "OP-NORD-5",
33
"soc": "cliffs",
44
"branch": "wild/sm8635",
5-
"manifest": "oneplus_nord_5.xml",
5+
"manifest": "oneplus_nord_5_v.xml",
66
"android_version": "android14",
77
"kernel_version": "6.1",
88
"os_version": "OOS15",

manifests/oos15/oneplus_10_pro_v.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
<remote fetch="https://github.com/OnePlusOSS" name="origin"/>
66
<project remote="origin" name="android_kernel_common_oneplus_sm8450" path="kernel_platform/common" revision="oneplus/sm8450_v_15.0.0_oneplus_10_pro"/>
77
<project remote="origin" name="android_kernel_modules_and_devicetree_oneplus_sm8450" path="./" revision="oneplus/sm8450_v_15.0.0_oneplus_10_pro"/>
8+
<project name="kernel/prebuilts/build-tools" path="kernel_platform/prebuilts/kernel-build-tools" revision="10ab783184f77d3ea15bf666426a7138b0f62bfc" upstream="refs/heads/ks-kernel.lnx.1.0.r1-rel"/>
89
<project name="kernelplatform/prebuilts-master/clang/host/linux-x86" path="kernel_platform/prebuilts-master/clang/host/linux-x86" revision="0fc3d01a780023469b7acc18c56a9cf5099a6d6c" upstream="refs/heads/ks-kernel.lnx.1.0.r1-rel"/>
910
</manifest>

manifests/oos15/oneplus_10t_v.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
<remote fetch="https://github.com/OnePlusOSS" name="origin"/>
66
<project remote="origin" name="android_kernel_common_oneplus_sm8475" path="kernel_platform/common" revision="oneplus/sm8475_v_15.0.0_oneplus_10t"/>
77
<project remote="origin" name="android_kernel_modules_and_devicetree_oneplus_sm8475" path="./" revision="oneplus/sm8475_v_15.0.0_oneplus_10t"/>
8+
<project remote="clo" name="kernel/prebuilts/build-tools" path="kernel_platform/prebuilts/kernel-build-tools" revision="10ab783184f77d3ea15bf666426a7138b0f62bfc" upstream="refs/heads/ks-kernel.lnx.1.0.r1-rel"/>
89
<project remote="clo" name="kernelplatform/prebuilts-master/clang/host/linux-x86" path="kernel_platform/prebuilts-master/clang/host/linux-x86" revision="0fc3d01a780023469b7acc18c56a9cf5099a6d6c" upstream="refs/heads/ks-kernel.lnx.1.0.r1-rel"/>
910
</manifest>

manifests/oos15/oneplus_11_v.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
<linkfile dest=".source_date_epoch_dir" src="."/>
88
</project>
99
<project remote="origin" name="android_kernel_modules_and_devicetree_oneplus_sm8550" path="./" revision="oneplus/sm8550_v_15.0.0_oneplus11"/>
10+
<project remote="clo-la" name="kernel/prebuilts/build-tools" path="kernel_platform/prebuilts/kernel-build-tools" revision="a27755ba41db8a1487c7d2ac7d0da22ec5e593c7" upstream="refs/heads/ks-kernel.lnx.2.0.r1-rel"/>
1011
<project remote="clo-la" name="kernelplatform/prebuilts-master/clang/host/linux-x86" path="kernel_platform/prebuilts/clang/host/linux-x86" revision="c420e3ab93e51a2f2ab4f8e8b517463c34a7e8bd" upstream="refs/heads/ks-kernel.lnx.2.0.r1-rel"/>
1112
</manifest>

manifests/oos15/oneplus_11r_v.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
<remote fetch="https://github.com/OnePlusOSS" name="origin"/>
66
<project remote="origin" name="android_kernel_common_oneplus_sm8475" path="kernel_platform/common" revision="oneplus/sm8475_v_15.0.0_oneplus_11r"/>
77
<project remote="origin" name="android_kernel_modules_and_devicetree_oneplus_sm8475" path="./" revision="oneplus/sm8475_v_15.0.0_oneplus_11r"/>
8+
<project remote="clo" name="kernel/prebuilts/build-tools" path="kernel_platform/prebuilts/kernel-build-tools" revision="10ab783184f77d3ea15bf666426a7138b0f62bfc" upstream="refs/heads/ks-kernel.lnx.1.0.r1-rel"/>
89
<project remote="clo" name="kernelplatform/prebuilts-master/clang/host/linux-x86" path="kernel_platform/prebuilts-master/clang/host/linux-x86" revision="0fc3d01a780023469b7acc18c56a9cf5099a6d6c" upstream="refs/heads/ks-kernel.lnx.1.0.r1-rel"/>
910
</manifest>

manifests/oos15/oneplus_12_v.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,8 @@
77
<linkfile dest="kernel_platform/.source_date_epoch_dir" src="."/>
88
</project>
99
<project remote="origin" name="android_kernel_modules_and_devicetree_oneplus_sm8650" path="./" revision="oneplus/sm8650_v_15.0.0_oneplus12"/>
10+
<project remote="clo-la" name="kernel/prebuilts/build-tools" path="kernel_platform/prebuilts/kernel-build-tools" revision="d153b7ab4a4956198957e258d4f370e875c53059" upstream="refs/heads/ks-kernel.lnx.3.0.r1-rel" clone-depth="1">
11+
<linkfile dest="kernel_platform/build/prebuilts/kernel-build-tools" src="."/>
12+
</project>
1013
<project remote="clo-la" name="kernelplatform/prebuilts-master/clang/host/linux-x86" path="kernel_platform/prebuilts/clang/host/linux-x86" revision="28b975ada54f8610ed531a6b57253aed10e7c87d" upstream="refs/heads/ks-kernel.lnx.3.0.r1-rel" clone-depth="1"/>
1114
</manifest>

manifests/oos15/oneplus_12r_v.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
<linkfile dest=".source_date_epoch_dir" src="."/>
88
</project>
99
<project remote="origin" name="android_kernel_modules_and_devicetree_oneplus_sm8550" path="./" revision="oneplus/sm8550_v_15.0.0_oneplus_12r"/>
10+
<project remote="clo-la" name="kernel/prebuilts/build-tools" path="kernel_platform/prebuilts/kernel-build-tools" revision="a27755ba41db8a1487c7d2ac7d0da22ec5e593c7" upstream="refs/heads/ks-kernel.lnx.2.0.r1-rel"/>
1011
<project remote="clo-la" name="kernelplatform/prebuilts-master/clang/host/linux-x86" path="kernel_platform/prebuilts/clang/host/linux-x86" revision="c420e3ab93e51a2f2ab4f8e8b517463c34a7e8bd" upstream="refs/heads/ks-kernel.lnx.2.0.r1-rel"/>
1112
</manifest>

manifests/oos15/oneplus_13.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,7 @@
77
<linkfile dest="kernel_platform/.source_date_epoch_dir" src="."/>
88
</project>
99
<project remote="origin" name="android_kernel_modules_and_devicetree_oneplus_sm8750" path="./" revision="oneplus/sm8750_v_15.0.0_oneplus_13"/>
10+
<project remote="clo-la" name="kernel_platform/prebuilts/rust" path="kernel_platform/prebuilts/rust" revision="aff65346a9f85db2c8fd1d0c13b6dcd0bee76390" upstream="refs/heads/ks-kernel.lnx.4.0.r1-rel"/>
11+
<project remote="clo-la" name="kernel/prebuilts/build-tools" path="kernel_platform/prebuilts/kernel-build-tools" revision="434f141b6d22a773a163fa9c707b19b4d254d989" upstream="refs/heads/ks-kernel.lnx.4.0.r1-rel" groups="ddk"/>
1012
<project remote="clo-la" name="kernelplatform/prebuilts-master/clang/host/linux-x86" path="kernel_platform/prebuilts/clang/host/linux-x86" revision="b099698c583b8361ca771f3cc8d6af6f729f39b3" upstream="refs/heads/ks-kernel.lnx.4.0.r1-rel" groups="ddk"/>
1113
</manifest>

manifests/oos15/oneplus_13_global.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,7 @@
77
<linkfile dest="kernel_platform/.source_date_epoch_dir" src="."/>
88
</project>
99
<project remote="origin" name="android_kernel_modules_and_devicetree_oneplus_sm8750" path="./" revision="oneplus/sm8750_v_15.0.0_oneplus_13_global"/>
10+
<project remote="clo-la" name="kernel_platform/prebuilts/rust" path="kernel_platform/prebuilts/rust" revision="aff65346a9f85db2c8fd1d0c13b6dcd0bee76390" upstream="refs/heads/ks-kernel.lnx.4.0.r1-rel"/>
11+
<project remote="clo-la" name="kernel/prebuilts/build-tools" path="kernel_platform/prebuilts/kernel-build-tools" revision="434f141b6d22a773a163fa9c707b19b4d254d989" upstream="refs/heads/ks-kernel.lnx.4.0.r1-rel" groups="ddk"/>
1012
<project remote="clo-la" name="kernelplatform/prebuilts-master/clang/host/linux-x86" path="kernel_platform/prebuilts/clang/host/linux-x86" revision="b099698c583b8361ca771f3cc8d6af6f729f39b3" upstream="refs/heads/ks-kernel.lnx.4.0.r1-rel" groups="ddk"/>
1113
</manifest>

0 commit comments

Comments
 (0)