Skip to content

Commit 3f3c874

Browse files
fatalcoder524fatalcoder524
committed
Full refactor from OOS to A
1 parent f9557e9 commit 3f3c874

288 files changed

Lines changed: 175 additions & 175 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/actions/build-kernel/action.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,8 @@ runs:
196196
197197
if [[ -z "$os_version" ]]; then
198198
errors+=("Input 'os_version' cannot be empty")
199-
elif [[ ! "$os_version" =~ ^OOS ]]; then
200-
errors+=("Input 'os_version' does not start with 'OOS'. Got: '$os_version'")
199+
elif [[ ! "$os_version" =~ ^A ]]; then
200+
errors+=("Input 'os_version' does not start with 'A'. Got: '$os_version'")
201201
fi
202202
203203
if [[ -z "$hmbird" ]]; then
@@ -1372,8 +1372,8 @@ runs:
13721372
OP10r|OP-ACE-2-5.10.209|OP-ACE-2V-5.10.209|OP-PAD-MT6983-5.10.209|\
13731373
OP10pro-5.10.209|OP10t-5.10.209|OP-ACE-5.10.209|OP11r-5.10.209|\
13741374
OP-NORD-3-5.10.209|OP-ACE-RACE-5.10.209)
1375-
if [[ "$OP_OS_VERSION" == "OOS15" ]]; then
1376-
NTSYNC_PATCH="$NTSYNC_FOLDER/ntsync_compat_android12-5.10_OOS14.patch"
1375+
if [[ "$OP_OS_VERSION" == "A15" ]]; then
1376+
NTSYNC_PATCH="$NTSYNC_FOLDER/ntsync_compat_android12-5.10_A14.patch"
13771377
fi
13781378
;;
13791379
esac
@@ -1387,7 +1387,7 @@ runs:
13871387
elif [ -f "$NTSYNC_FOLDER/ntsync_compat_${GKI_KEY}.patch" ]; then
13881388
NTSYNC_PATCH="$NTSYNC_FOLDER/ntsync_compat_${GKI_KEY}.patch"
13891389
else
1390-
echo "::error::NTSync patch not found for ${GKI_KEY} (Model: ${OP_MODEL}, OOS: ${OP_OS_VERSION})"
1390+
echo "::error::NTSync patch not found for ${GKI_KEY} (Model: ${OP_MODEL}, Android Version: ${OP_OS_VERSION})"
13911391
exit 1
13921392
fi
13931393

‎.github/workflows/build-kernel-release.yml‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@ on:
1717
required: true
1818
type: choice
1919
options:
20-
- OOS14+15+16
21-
- OOS15+16
22-
- OOS14+15
23-
- OOS16
24-
- OOS15
25-
- OOS14
20+
- A14+15+16
21+
- A15+16
22+
- A14+15
23+
- A16
24+
- A15
25+
- A14
2626
- android16-6.12
2727
- android15-6.6
2828
- android14-6.1
2929
- android13-5.15
3030
- android12-5.10
31-
default: OOS14+15+16
31+
default: A14+15+16
3232
ksu_options:
3333
description: 'Enter KernelSU build json'
3434
required: true
@@ -137,32 +137,32 @@ jobs:
137137
jq_filter="."
138138
139139
case "$input" in
140-
OOS14+15+16)
140+
A14+15+16)
141141
;;
142-
OOS15+16)
143-
jq_filter="map(select(.os_version == \"OOS15\" or .os_version == \"OOS16\"))"
142+
A15+16)
143+
jq_filter="map(select(.os_version == \"A15\" or .os_version == \"A16\"))"
144144
;;
145-
OOS14+15)
146-
jq_filter="map(select(.os_version == \"OOS14\" or .os_version == \"OOS15\"))"
145+
A14+15)
146+
jq_filter="map(select(.os_version == \"A14\" or .os_version == \"A15\"))"
147147
;;
148-
OOS16)
149-
jq_filter="map(select(.os_version == \"OOS16\"))"
148+
A16)
149+
jq_filter="map(select(.os_version == \"A16\"))"
150150
;;
151-
OOS15)
152-
jq_filter="map(select(.os_version == \"OOS15\"))"
151+
A15)
152+
jq_filter="map(select(.os_version == \"A15\"))"
153153
;;
154-
OOS14)
155-
jq_filter="map(select(.os_version == \"OOS14\"))"
154+
A14)
155+
jq_filter="map(select(.os_version == \"A14\"))"
156156
;;
157157
android*-*.*)
158158
# Extract android version and kernel version
159159
IFS='-' read -r av kv <<< "$input"
160160
161-
# Build android*-* only for OOS15 and OOS16
162-
jq_filter="map(select(.os_version == \"OOS15\" or .os_version == \"OOS16\")) | map(select(.android_version == \"$av\" and .kernel_version == \"$kv\"))"
161+
# Build android*-* only for A15 and A16
162+
jq_filter="map(select(.os_version == \"A15\" or .os_version == \"A16\")) | map(select(.android_version == \"$av\" and .kernel_version == \"$kv\"))"
163163
164164
echo "ℹ️ Android-Kernel filter applied: $av-$kv"
165-
echo " Restricted to: OOS15 and OOS16 only"
165+
echo " Restricted to: A15 and A16 only"
166166
;;
167167
*)
168168
echo "::warning::Unknown input '$input'. Using empty filter."
@@ -175,7 +175,7 @@ jobs:
175175
176176
filtered=$(echo "$filtered" | jq '
177177
sort_by(
178-
(.os_version | gsub("OOS"; "") | tonumber) * -1,
178+
(.os_version | gsub("A"; "") | tonumber) * -1,
179179
.model
180180
)
181181
')
@@ -412,7 +412,7 @@ jobs:
412412
413413
merged_matrix=$(echo "$merged_matrix" | jq '
414414
sort_by(
415-
(.os_version | gsub("OOS"; "") | tonumber? // 0) * -1,
415+
(.os_version | gsub("A"; "") | tonumber? // 0) * -1,
416416
.model
417417
)
418418
')
@@ -516,10 +516,10 @@ jobs:
516516
echo "" >> $GITHUB_STEP_SUMMARY
517517
echo "> **💡 Note:** Hashes are resolved at run time via API calls before builds start." >> $GITHUB_STEP_SUMMARY
518518
519-
# Add OOS restriction note for android-kernel filters
519+
# Add A restriction note for android-kernel filters
520520
if [[ "${{ inputs.op_model }}" == android*-*.* ]]; then
521521
echo "" >> $GITHUB_STEP_SUMMARY
522-
echo "> **⚠️ Android-Kernel Filter:** Only OOS15 and OOS16 devices will be built for \`${{ inputs.op_model }}\`" >> $GITHUB_STEP_SUMMARY
522+
echo "> **⚠️ Android-Kernel Filter:** Only A15 and A16 devices will be built for \`${{ inputs.op_model }}\`" >> $GITHUB_STEP_SUMMARY
523523
fi
524524
525525
mirror_toolchain:
@@ -1009,8 +1009,8 @@ jobs:
10091009
fi
10101010
fi
10111011
1012-
if [[ "$os_ver" =~ ^OOS[0-9]+$ ]]; then
1013-
os_display_version="Android ${os_ver#OOS}"
1012+
if [[ "$os_ver" =~ ^A[0-9]+$ ]]; then
1013+
os_display_version="Android ${os_ver#A}"
10141014
else
10151015
os_display_version=$os_ver
10161016
fi

configs/oos14/OP-ACE-2V.json renamed to configs/a14/OP-ACE-2V.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"manifest": "oneplus_ace2v_u.xml",
66
"android_version": "android12",
77
"kernel_version": "5.10",
8-
"os_version": "OOS14",
8+
"os_version": "A14",
99
"lto": "thin",
1010
"zyc_compiler": "",
1111
"c_compiler": "kernel_platform/prebuilts-master/clang/host/linux-x86/clang-r416183c/bin",

configs/oos14/OP-ACE-3-PRO.json renamed to configs/a14/OP-ACE-3-PRO.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"manifest": "oneplus_ace3_pro_u.xml",
66
"android_version": "android14",
77
"kernel_version": "6.1",
8-
"os_version": "OOS14",
8+
"os_version": "A14",
99
"lto": "thin",
1010
"zyc_compiler": "",
1111
"c_compiler": "kernel_platform/prebuilts/clang/host/linux-x86/clang-r487747c/bin",

configs/oos14/OP-ACE-RACE.json renamed to configs/a14/OP-ACE-RACE.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"manifest": "oneplus_ace_race_u.xml",
66
"android_version": "android12",
77
"kernel_version": "5.10",
8-
"os_version": "OOS14",
8+
"os_version": "A14",
99
"lto": "thin",
1010
"zyc_compiler": "",
1111
"c_compiler": "kernel_platform/prebuilts-master/clang/host/linux-x86/clang-r416183c/bin",

configs/oos14/OP-ACE.json renamed to configs/a14/OP-ACE.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"manifest": "oneplus_ace_u.xml",
66
"android_version": "android12",
77
"kernel_version": "5.10",
8-
"os_version": "OOS14",
8+
"os_version": "A14",
99
"lto": "thin",
1010
"zyc_compiler": "",
1111
"c_compiler": "kernel_platform/prebuilts-master/clang/host/linux-x86/clang-r416183c/bin",

configs/oos14/OP-NORD-3.json renamed to configs/a14/OP-NORD-3.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"manifest": "oneplus_nord_3_u.xml",
66
"android_version": "android12",
77
"kernel_version": "5.10",
8-
"os_version": "OOS14",
8+
"os_version": "A14",
99
"lto": "thin",
1010
"zyc_compiler": "",
1111
"c_compiler": "kernel_platform/prebuilts-master/clang/host/linux-x86/clang-r416183c/bin",

configs/oos14/OP-PAD-GO.json renamed to configs/a14/OP-PAD-GO.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"manifest": "oneplus_pad_go_u.xml",
66
"android_version": "android12",
77
"kernel_version": "5.10",
8-
"os_version": "OOS14",
8+
"os_version": "A14",
99
"lto": "thin",
1010
"zyc_compiler": "",
1111
"c_compiler": "kernel_platform/prebuilts-master/clang/host/linux-x86/clang-r416183c/bin",

configs/oos14/OP-PAD-MT6983.json renamed to configs/a14/OP-PAD-MT6983.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"manifest": "oneplus_pad_mt6983_u.xml",
66
"android_version": "android12",
77
"kernel_version": "5.10",
8-
"os_version": "OOS14",
8+
"os_version": "A14",
99
"lto": "thin",
1010
"zyc_compiler": "",
1111
"c_compiler": "kernel_platform/prebuilts-master/clang/host/linux-x86/clang-r416183c/bin",

configs/oos14/OP-PAD-PRO.json renamed to configs/a14/OP-PAD-PRO.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"manifest": "oneplus_pad_pro_u.xml",
66
"android_version": "android14",
77
"kernel_version": "6.1",
8-
"os_version": "OOS14",
8+
"os_version": "A14",
99
"lto": "thin",
1010
"zyc_compiler": "",
1111
"c_compiler": "kernel_platform/prebuilts/clang/host/linux-x86/clang-r487747c/bin",

0 commit comments

Comments
 (0)