From 4c702201c6e949971d4b3ab439f6006de069c6d9 Mon Sep 17 00:00:00 2001 From: Dmitry Muhomor Date: Wed, 6 Dec 2023 17:38:58 +0200 Subject: [PATCH] Revert "use default patch level for 5th gen Pixels" This reverts commit 8a5b54f5c0f9551deec52452381c577fbf41fa63. --- config/device/common/gen5pixel.yml | 1 + vendor-skels/google_devices/barbet/barbet.mk.skip | 4 ++++ vendor-skels/google_devices/barbet/cmds-for-envsetup.sh | 2 +- vendor-skels/google_devices/bramble/bramble.mk.skip | 4 ++++ vendor-skels/google_devices/bramble/cmds-for-envsetup.sh | 2 +- vendor-skels/google_devices/redfin/cmds-for-envsetup.sh | 2 +- vendor-skels/google_devices/redfin/redfin.mk.skip | 4 ++++ vendor-specs/google_devices/barbet.yml | 4 ++-- vendor-specs/google_devices/bramble.yml | 4 ++-- vendor-specs/google_devices/redfin.yml | 4 ++-- 10 files changed, 22 insertions(+), 9 deletions(-) diff --git a/config/device/common/gen5pixel.yml b/config/device/common/gen5pixel.yml index 15aebec..0870ea0 100644 --- a/config/device/common/gen5pixel.yml +++ b/config/device/common/gen5pixel.yml @@ -7,6 +7,7 @@ includes: device: build_id: UP1A.231105.001 + platform_security_patch_level_override: 2023-11-05 filters: files: diff --git a/vendor-skels/google_devices/barbet/barbet.mk.skip b/vendor-skels/google_devices/barbet/barbet.mk.skip index 20fc7b3..a4e1391 100644 --- a/vendor-skels/google_devices/barbet/barbet.mk.skip +++ b/vendor-skels/google_devices/barbet/barbet.mk.skip @@ -13,3 +13,7 @@ PRODUCT_MANUFACTURER := Google ifneq ($(BUILD_ID),UP1A.231105.001) $(error BUILD_ID: expected UP1A.231105.001, got $(BUILD_ID)) endif + +ifneq ($(PLATFORM_SECURITY_PATCH),2023-11-05) + $(error PLATFORM_SECURITY_PATCH: expected 2023-11-05, got $(PLATFORM_SECURITY_PATCH)) +endif diff --git a/vendor-skels/google_devices/barbet/cmds-for-envsetup.sh b/vendor-skels/google_devices/barbet/cmds-for-envsetup.sh index 638efa0..adc631b 100644 --- a/vendor-skels/google_devices/barbet/cmds-for-envsetup.sh +++ b/vendor-skels/google_devices/barbet/cmds-for-envsetup.sh @@ -1,2 +1,2 @@ export BUILD_ID_barbet="UP1A.231105.001" -unset PLATFORM_SECURITY_PATCH_barbet +export PLATFORM_SECURITY_PATCH_barbet="2023-11-05" diff --git a/vendor-skels/google_devices/bramble/bramble.mk.skip b/vendor-skels/google_devices/bramble/bramble.mk.skip index 6f33c9e..bc2b8a1 100644 --- a/vendor-skels/google_devices/bramble/bramble.mk.skip +++ b/vendor-skels/google_devices/bramble/bramble.mk.skip @@ -13,3 +13,7 @@ PRODUCT_MANUFACTURER := Google ifneq ($(BUILD_ID),UP1A.231105.001) $(error BUILD_ID: expected UP1A.231105.001, got $(BUILD_ID)) endif + +ifneq ($(PLATFORM_SECURITY_PATCH),2023-11-05) + $(error PLATFORM_SECURITY_PATCH: expected 2023-11-05, got $(PLATFORM_SECURITY_PATCH)) +endif diff --git a/vendor-skels/google_devices/bramble/cmds-for-envsetup.sh b/vendor-skels/google_devices/bramble/cmds-for-envsetup.sh index 12dd464..0077345 100644 --- a/vendor-skels/google_devices/bramble/cmds-for-envsetup.sh +++ b/vendor-skels/google_devices/bramble/cmds-for-envsetup.sh @@ -1,2 +1,2 @@ export BUILD_ID_bramble="UP1A.231105.001" -unset PLATFORM_SECURITY_PATCH_bramble +export PLATFORM_SECURITY_PATCH_bramble="2023-11-05" diff --git a/vendor-skels/google_devices/redfin/cmds-for-envsetup.sh b/vendor-skels/google_devices/redfin/cmds-for-envsetup.sh index 43a3b6d..c99adfa 100644 --- a/vendor-skels/google_devices/redfin/cmds-for-envsetup.sh +++ b/vendor-skels/google_devices/redfin/cmds-for-envsetup.sh @@ -1,2 +1,2 @@ export BUILD_ID_redfin="UP1A.231105.001" -unset PLATFORM_SECURITY_PATCH_redfin +export PLATFORM_SECURITY_PATCH_redfin="2023-11-05" diff --git a/vendor-skels/google_devices/redfin/redfin.mk.skip b/vendor-skels/google_devices/redfin/redfin.mk.skip index 2e5f120..aceb2bb 100644 --- a/vendor-skels/google_devices/redfin/redfin.mk.skip +++ b/vendor-skels/google_devices/redfin/redfin.mk.skip @@ -15,3 +15,7 @@ include device/google/redfin/wireless_charger/wireless_charger.mk ifneq ($(BUILD_ID),UP1A.231105.001) $(error BUILD_ID: expected UP1A.231105.001, got $(BUILD_ID)) endif + +ifneq ($(PLATFORM_SECURITY_PATCH),2023-11-05) + $(error PLATFORM_SECURITY_PATCH: expected 2023-11-05, got $(PLATFORM_SECURITY_PATCH)) +endif diff --git a/vendor-specs/google_devices/barbet.yml b/vendor-specs/google_devices/barbet.yml index d93de6e..88cb70e 100644 --- a/vendor-specs/google_devices/barbet.yml +++ b/vendor-specs/google_devices/barbet.yml @@ -2,8 +2,8 @@ Android.bp: c9ffd08891ecb53ae8e9094354e795dd69f8739b43792c4ad4b3bc7c768affcf Android.mk: 779d2670714ba5ecf1a0e38a98156d8e58e32f72ebb0d07ef8320fb615cd9ed5 AndroidProducts.mk: 59cb06566408d0c7a1133cd4b737e10d5414b52842470185a4b57c0ba9f586a1 README.md: 6c4acd48602c29dba5ee0bddfb9758a03887cb3af309591f460b112ebf410bf0 -barbet.mk: 88239cb02bdabc1b21d384c911320fc83c992a0ddc1fc5d4b3fb235521da05e5 -cmds-for-envsetup.sh: 430e1f96e4078987d59eb80f525c5bc31e72d27d04e776dcd4357242357a7fef +barbet.mk: 5ec4e8153b68a23da09e35beb3fbb5efe0aa529659becb5be8a5a66071a85cc0 +cmds-for-envsetup.sh: e4e7cbca40910321082054ba8e0f3c35d0610c5fc64e459d01e6c5fbb1cfd203 firmware: dir firmware/abl.img: d55f199a8834985233fca3b6b7540074f1101dba39c927d74172f9d308b4fab4 firmware/android-info.txt: 3a6c7326806091d2482d208aa8555cd0edbb617f72e8dd6d915f686295e58890 diff --git a/vendor-specs/google_devices/bramble.yml b/vendor-specs/google_devices/bramble.yml index b1aa62f..d682a24 100644 --- a/vendor-specs/google_devices/bramble.yml +++ b/vendor-specs/google_devices/bramble.yml @@ -2,8 +2,8 @@ Android.bp: c9ffd08891ecb53ae8e9094354e795dd69f8739b43792c4ad4b3bc7c768affcf Android.mk: 6f19c305a871f3ff14e10719c0a4a29bd23ab56d225a210bcdcd7b3f8f248b59 AndroidProducts.mk: b0ac9ed34f646f349d985f637a7e8d1b0412f3be70f78e9c3a4fd2669b81f4a6 README.md: aea083d1852ec210deb59ac5f452b684ada27bba228ff7343ae8e432791a96a3 -bramble.mk: dcba42652e67937315019264773b26c4294f9adb7fff0ede40b0c41c048b9c83 -cmds-for-envsetup.sh: 2d67a50d01ac9ddc2b309f30498091138b2833c7fd86de512ac12eb2d380a04d +bramble.mk: cc76c8de773714b6e476935aff4a2f5d062fd02d1a7bd767ebb3acba3b48dd25 +cmds-for-envsetup.sh: e057b1b45edfc5a0ab5d1318152da52f03e2550869c3ebdc2dcf9d41bea29812 firmware: dir firmware/abl.img: 1a14a6a3cb65fcdab9c6121d81c81f50084283d206a75865c71c2382fd9cfefe firmware/android-info.txt: 521661cbf9878e63a0cf7148802087e8c0f0f335d7dd01d9442e0ab4a4ab3c74 diff --git a/vendor-specs/google_devices/redfin.yml b/vendor-specs/google_devices/redfin.yml index ac51996..52b9ec4 100644 --- a/vendor-specs/google_devices/redfin.yml +++ b/vendor-specs/google_devices/redfin.yml @@ -2,7 +2,7 @@ Android.bp: c9ffd08891ecb53ae8e9094354e795dd69f8739b43792c4ad4b3bc7c768affcf Android.mk: f75271d1eba45eb471e9b3dffa0f7408651e6200e01dc042bed822421d590c29 AndroidProducts.mk: fb1b98422dbed3055ca8adf4274b8925e047979f54a34a5832148e8274d7b7e0 README.md: 3c35cb6ff3f9002cdedf1c62fff48a21bcc2bde96be22bcfeba3ddd1ed69514b -cmds-for-envsetup.sh: 51e77d7453f29a339fdaeee4c9a7238b29c8452972f3886ebac938aa64d7882d +cmds-for-envsetup.sh: a1b28239a8483da4d7ebc3438db4ab81d1b8e68359b5df53f7e41fec8d4bdbcf firmware: dir firmware/abl.img: 8ed75e02acf7afccc5c5ce396b87adcc1a865ec945bef52bbeff678393526b6e firmware/android-info.txt: 9ab68208aa328c1d6056db3470360190210fbd9ca626ab8cfbdd570758c5c426 @@ -3252,6 +3252,6 @@ proprietary/vendor/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/common/Defau proprietary/vendor/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/generic/common/Default/Default/mcfg_sw.mbn: 79958e473ff16a785c8d06affd88dcdefbb438844a63b00f3b225502b313e86a proprietary/vendor/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/mbn_sw.dig: 543912ebfa76753a6702d45700b1ffaa20b04038cf2cec92d58bdacf72b507ca proprietary/vendor/rfs/msm/mpss/readonly/vendor/mbn/mcfg_sw/mbn_sw.txt: 7a38d00047a739d587965af9e64ea3dfcf0c3b0e1aa8d0e28a73add15851d746 -redfin.mk: 059ea57b4f11f3ef6202f75afc1bdb53ea761746cd4c3090c1d06abcaf7c09b1 +redfin.mk: c4bb33816b393804df6aa365efb57663b2b55aacaf7436cfa06c3f697218ae29 sepolicy: dir vintf: dir