Skip to content

Commit fa1f6b7

Browse files
committed
drop support for devices other than 5th gen Pixels
1 parent 4e451f8 commit fa1f6b7

File tree

4 files changed

+5
-100
lines changed

4 files changed

+5
-100
lines changed

generate-deltas.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ shift
1717

1818
export TMPDIR="${OUT:-$PWD/delta-generation}"
1919

20-
parallel -j4 -q script/generate-delta.sh ::: comet komodo caiman tokay akita husky shiba felix tangorpro lynx cheetah panther bluejay raven oriole barbet redfin bramble ::: $@ ::: $SOURCE
20+
parallel -j4 -q script/generate-delta.sh ::: barbet redfin bramble ::: $@ ::: $SOURCE

generate-release.sh

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,7 @@ get_radio_image() {
5454

5555
unzip $TARGET_FILES_INPUT OTA/android-info.txt
5656

57-
if [[ $DEVICE == @(comet|komodo|caiman|tokay|akita|husky|shiba|felix|tangorpro|lynx|cheetah|panther|bluejay|raven|oriole) ]]; then
58-
BOOTLOADER=$(get_radio_image bootloader)
59-
[[ $DEVICE != tangorpro ]] && RADIO=$(get_radio_image baseband)
60-
DISABLE_UART=true
61-
DISABLE_FIPS=true
62-
DISABLE_DPM=true
63-
elif [[ $DEVICE == @(barbet|redfin|bramble) ]]; then
57+
if [[ $DEVICE == @(barbet|redfin|bramble) ]]; then
6458
BOOTLOADER=$(get_radio_image bootloader)
6559
RADIO=$(get_radio_image baseband)
6660
DISABLE_UART=true
@@ -169,10 +163,7 @@ img_from_target_files $TARGET_FILES $DEVICE-img-$BUILD_NUMBER.zip
169163

170164
source device/common/generate-factory-images-common.sh
171165

172-
MAX_DOWNLOAD_SIZE=0xf900000
173-
if [[ $DEVICE == @(barbet|redfin|bramble) ]]; then
174-
MAX_DOWNLOAD_SIZE=0x10000000
175-
fi
166+
MAX_DOWNLOAD_SIZE=0x10000000
176167

177168
# Second arg to optimize-factory-image is the name of outer zip directory.
178169
# Output zip name defaults to <outer zip dir name>.zip

generate-releases.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ chrt -b -p 0 $$
1414

1515
export TMPDIR="${OUT:-$PWD/delta-generation}"
1616

17-
parallel -j4 -q script/generate-release.sh ::: comet komodo caiman tokay akita husky shiba felix tangorpro lynx cheetah panther bluejay raven oriole barbet redfin bramble ::: $1
17+
parallel -j4 -q script/generate-release.sh ::: barbet redfin bramble ::: $1

manage.sh

Lines changed: 1 addition & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,12 @@ fi
1919
readonly aosp_forks=(
2020
device_common
2121
device_generic_goldfish
22-
device_google_akita
2322
device_google_barbet
2423
device_google_barbet-sepolicy
25-
device_google_bluejay
2624
device_google_bramble
27-
device_google_felix
28-
device_google_gs-common
29-
device_google_gs101
30-
device_google_gs101-sepolicy
31-
device_google_gs201
32-
device_google_gs201-sepolicy
33-
device_google_lynx
34-
device_google_pantah
35-
device_google_raviole
3625
device_google_redbull
3726
device_google_redbull-sepolicy
3827
device_google_redfin
39-
device_google_shusky
40-
device_google_tangorpro
41-
device_google_zuma
42-
device_google_zuma-sepolicy
4328
kernel_configs
4429
platform_art
4530
platform_bionic
@@ -112,23 +97,6 @@ readonly kernels=(
11297
kernel_msm-redbull
11398
kernel_msm-modules_qcacld-redbull
11499
kernel_msm-extra-redbull
115-
116-
kernel_build-gs
117-
kernel_devices_google_tangorpro
118-
kernel_gs
119-
kernel_google-modules_amplifiers-gs
120-
kernel_google-modules_power_reset-gs
121-
kernel_google-modules_wlan_bcmdhd_bcm4389
122-
123-
kernel_build-zuma
124-
kernel_devices_google_akita
125-
kernel_devices_google_shusky
126-
kernel_google-modules_amplifiers-zuma
127-
kernel_google-modules_power_reset-zuma
128-
kernel_google-modules_soc_gs
129-
kernel_google-modules_uwb_qorvo_qm35
130-
kernel_google-modules_wlan_bcmdhd_bcm4383
131-
kernel_google-modules_wlan_bcmdhd_bcm4398
132100
)
133101

134102
declare -Ar kernel_tags_old=(
@@ -137,25 +105,6 @@ declare -Ar kernel_tags_old=(
137105
[kernel_msm-redbull]=android-14.0.0_r0.111
138106
[kernel_msm-modules_qcacld-redbull]=android-14.0.0_r0.111
139107
[kernel_msm-extra-redbull]=android-14.0.0_r0.111
140-
141-
# September 2024
142-
[kernel_build-gs]=android-14.0.0_r0.135
143-
[kernel_devices_google_tangorpro]=android-14.0.0_r0.135
144-
[kernel_gs]=android-14.0.0_r0.135
145-
[kernel_google-modules_amplifiers-gs]=android-14.0.0_r0.135
146-
[kernel_google-modules_power_reset-gs]=android-14.0.0_r0.135
147-
[kernel_google-modules_wlan_bcmdhd_bcm4389]=android-14.0.0_r0.135
148-
149-
# September 2024
150-
[kernel_build-zuma]=android-14.0.0_r0.137
151-
[kernel_devices_google_akita]=android-14.0.0_r0.137
152-
[kernel_devices_google_shusky]=android-14.0.0_r0.137
153-
[kernel_google-modules_amplifiers-zuma]=android-14.0.0_r0.137
154-
[kernel_google-modules_power_reset-zuma]=android-14.0.0_r0.137
155-
[kernel_google-modules_soc_gs]=android-14.0.0_r0.137
156-
[kernel_google-modules_uwb_qorvo_qm35]=android-14.0.0_r0.137
157-
[kernel_google-modules_wlan_bcmdhd_bcm4383]=android-14.0.0_r0.137
158-
[kernel_google-modules_wlan_bcmdhd_bcm4398]=android-14.0.0_r0.137
159108
)
160109

161110
declare -Ar kernel_tags=(
@@ -164,49 +113,14 @@ declare -Ar kernel_tags=(
164113
[kernel_msm-redbull]=android-14.0.0_r0.111
165114
[kernel_msm-modules_qcacld-redbull]=android-14.0.0_r0.111
166115
[kernel_msm-extra-redbull]=android-14.0.0_r0.111
167-
168-
# September 2024
169-
[kernel_build-gs]=android-14.0.0_r0.135
170-
[kernel_devices_google_tangorpro]=android-14.0.0_r0.135
171-
[kernel_gs]=android-14.0.0_r0.135
172-
[kernel_google-modules_amplifiers-gs]=android-14.0.0_r0.135
173-
[kernel_google-modules_power_reset-gs]=android-14.0.0_r0.135
174-
[kernel_google-modules_wlan_bcmdhd_bcm4389]=android-14.0.0_r0.135
175-
176-
# September 2024
177-
[kernel_build-zuma]=android-14.0.0_r0.137
178-
[kernel_devices_google_akita]=android-14.0.0_r0.137
179-
[kernel_devices_google_shusky]=android-14.0.0_r0.137
180-
[kernel_google-modules_amplifiers-zuma]=android-14.0.0_r0.137
181-
[kernel_google-modules_power_reset-zuma]=android-14.0.0_r0.137
182-
[kernel_google-modules_soc_gs]=android-14.0.0_r0.137
183-
[kernel_google-modules_uwb_qorvo_qm35]=android-14.0.0_r0.137
184-
[kernel_google-modules_wlan_bcmdhd_bcm4383]=android-14.0.0_r0.137
185-
[kernel_google-modules_wlan_bcmdhd_bcm4398]=android-14.0.0_r0.137
186116
)
187117

188118
readonly independent=(
189119
adevtool
190120
branding
191-
device_google_akita-kernel
192-
device_google_bluejay-kernel
193-
device_google_felix-kernel
194-
device_google_lynx-kernel
195-
device_google_pantah-kernel
196-
device_google_raviole-kernel
197121
device_google_redbull-kernel
198-
device_google_shusky-kernel
199-
device_google_tangorpro-kernel
200122
hardened_malloc
201-
kernel_common-5.10
202-
kernel_common-5.15
203-
kernel_common-6.1
204-
kernel_manifest-5.10
205-
kernel_manifest-5.15
206-
kernel_manifest-6.1
207-
kernel_manifest-gs
208123
kernel_manifest-redbull
209-
kernel_manifest-zuma
210124
platform_external_AppCompatConfig
211125
platform_external_AppStore
212126
platform_external_Auditor
@@ -309,7 +223,7 @@ for repo in ${independent[@]}; do
309223
git tag -d $tag_name || true
310224
git push origin --delete $tag_name || true
311225
elif [[ $action == release ]]; then
312-
if [[ $repo == @(kernel_manifest-5.10|kernel_manifest-5.15|kernel_manifest-6.1|kernel_manifest-gs|kernel_manifest-redbull|kernel_manifest-zuma) ]]; then
226+
if [[ $repo == kernel_manifest-redbull ]]; then
313227
git checkout -B tmp
314228
sed -i s%refs/heads/$branch%refs/tags/$tag_name% default.xml
315229
git commit default.xml -m $tag_name

0 commit comments

Comments
 (0)