From bc68cf3f526d0ce4715026db98c2f053ae183bdf Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 30 May 2024 00:00:55 +0000 Subject: [PATCH 1/5] Update panther SVN to 59 Bug: 342381152 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c58b2daccaa7f26d6b18392dae83de68ee4de7b6) Merged-In: Idd25f5c1fa8da8a7bb045dac0a81f267ecbb556d Change-Id: Idd25f5c1fa8da8a7bb045dac0a81f267ecbb556d --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 2ba1948..091ce97 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -306,7 +306,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=58 + ro.vendor.build.svn=59 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 8dda41d0727863c6c2140ec08212ae7f96cf2f67 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 May 2024 23:40:20 +0000 Subject: [PATCH 2/5] Update cheetah SVN to 59 Bug: 342381152 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6afe8e8885f071bb13d3c2d644cff5f1c940f58f) Merged-In: I6ccef90e6b26a686c825b25be1b3b9bbacc80cba Change-Id: I6ccef90e6b26a686c825b25be1b3b9bbacc80cba --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 895dd8f..bb3e030 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -323,7 +323,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=58 + ro.vendor.build.svn=59 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From c517d85f6b3087ee6e9f118316d199173b8fd4e6 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Thu, 4 Apr 2024 00:10:05 +0000 Subject: [PATCH 3/5] pantah: Use build_flags for SVN Flag: build.RELEASE_SVN_CHEETAH Flag: build.RELEASE_SVN_PANTHER Bug: 332726030 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5d8a141aad34e31a92efd57ae9e8398eed1417e4) Merged-In: I97d624c43e943e2dc21efc2edb8360c43a4e48aa Change-Id: I97d624c43e943e2dc21efc2edb8360c43a4e48aa --- device-cheetah.mk | 9 ++++++++- device-panther.mk | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index bb3e030..ddeb077 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -322,8 +322,15 @@ PRODUCT_VENDOR_PROPERTIES += \ vendor.zram.size=3g # Increment the SVN for any official public releases +ifdef RELEASE_SVN_CHEETAH +TARGET_SVN ?= $(RELEASE_SVN_CHEETAH) +else +# Set this for older releases that don't use build flag +TARGET_SVN ?= 59 +endif + PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=59 + ro.vendor.build.svn=$(TARGET_SVN) # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ diff --git a/device-panther.mk b/device-panther.mk index 091ce97..803262c 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -305,8 +305,15 @@ PRODUCT_VENDOR_PROPERTIES += \ vendor.zram.size=3g # Increment the SVN for any official public releases +ifdef RELEASE_SVN_PANTHER +TARGET_SVN ?= $(RELEASE_SVN_PANTHER) +else +# Set this for older releases that don't use build flag +TARGET_SVN ?= 59 +endif + PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=59 + ro.vendor.build.svn=$(TARGET_SVN) # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 2e63019b4ade7c3601f9949da1ce201ad62122cd Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Mon, 15 Jul 2024 13:48:25 +0000 Subject: [PATCH 4/5] Update cheetah SVN to 60 Bug: 352170103 Flag: EXEMPT bugfix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:cf3cc4a874e817fb330988d982866183eba79208) Merged-In: Id9033d8d37de66bbb238aead0dbf7f380f4f9d10 Change-Id: Id9033d8d37de66bbb238aead0dbf7f380f4f9d10 --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index ddeb077..06adb3d 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -326,7 +326,7 @@ ifdef RELEASE_SVN_CHEETAH TARGET_SVN ?= $(RELEASE_SVN_CHEETAH) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 59 +TARGET_SVN ?= 60 endif PRODUCT_VENDOR_PROPERTIES += \ From 270793f2d609c552747750a061bc0bca6f3ccc23 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Mon, 15 Jul 2024 13:58:25 +0000 Subject: [PATCH 5/5] Update panther SVN to 60 Bug: 352170103 Flag: EXEMPT bugfix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:cc435349480d6fbffc45c130fe934bb2894b9e76) Merged-In: I5793f3fcbd31221a8c47658ad00629bcbf704bc0 Change-Id: I5793f3fcbd31221a8c47658ad00629bcbf704bc0 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 803262c..88a2305 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -309,7 +309,7 @@ ifdef RELEASE_SVN_PANTHER TARGET_SVN ?= $(RELEASE_SVN_PANTHER) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 59 +TARGET_SVN ?= 60 endif PRODUCT_VENDOR_PROPERTIES += \