From aa2bff5fae044d2a363bd53120b6d5e3e14ce8ea Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Wed, 3 Jul 2024 02:07:48 +0000 Subject: [PATCH 1/4] Update SVN to 2 Bug: 350826665 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7c8f65bf43c690f47cf4898daf346531738eb121) Merged-In: I2fb755d247f2efffa2f1c84322b52d33367d5cdb Change-Id: I2fb755d247f2efffa2f1c84322b52d33367d5cdb --- device-caiman.mk | 2 +- device-komodo.mk | 2 +- device-tokay.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/device-caiman.mk b/device-caiman.mk index 56b02b80..07cfd08a 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -70,7 +70,7 @@ include device/google/gs-common/pixelsupport/pixelsupport.mk # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=1 + ro.vendor.build.svn=2 # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,caiman) diff --git a/device-komodo.mk b/device-komodo.mk index 0084c88b..a4aa3474 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -70,7 +70,7 @@ include device/google/gs-common/pixelsupport/pixelsupport.mk # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=1 + ro.vendor.build.svn=2 # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,komodo) diff --git a/device-tokay.mk b/device-tokay.mk index 1b91969b..0701813b 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -60,7 +60,7 @@ include device/google/gs-common/pixelsupport/pixelsupport.mk # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=1 + ro.vendor.build.svn=2 # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,tokay) From faa3892f1c25b830dd1f8fff48af887cd718adac Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Fri, 5 Jul 2024 01:02:54 +0000 Subject: [PATCH 2/4] Update SVN to 3 Bug: 350826665 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b6a966e0aee1d1ea751bf76f6087cd09e41ead8b) Merged-In: I89a9733fdacfc6eef3f6bcb19cc4c0cb1bcc186c Change-Id: I89a9733fdacfc6eef3f6bcb19cc4c0cb1bcc186c --- device-caiman.mk | 2 +- device-komodo.mk | 2 +- device-tokay.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/device-caiman.mk b/device-caiman.mk index 07cfd08a..0bf7d900 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -70,7 +70,7 @@ include device/google/gs-common/pixelsupport/pixelsupport.mk # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=2 + ro.vendor.build.svn=3 # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,caiman) diff --git a/device-komodo.mk b/device-komodo.mk index a4aa3474..02fea019 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -70,7 +70,7 @@ include device/google/gs-common/pixelsupport/pixelsupport.mk # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=2 + ro.vendor.build.svn=3 # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,komodo) diff --git a/device-tokay.mk b/device-tokay.mk index 0701813b..fed02005 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -60,7 +60,7 @@ include device/google/gs-common/pixelsupport/pixelsupport.mk # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=2 + ro.vendor.build.svn=3 # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,tokay) From 8fc2025fe9d408901c7c046a5a2918d3b492d64f Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Wed, 10 Jul 2024 21:25:47 +0000 Subject: [PATCH 3/4] caimito: Use build_flags for SVN Flag: build.RELEASE_SVN_CAIMAN Flag: build.RELEASE_SVN_KOMODO Flag: build.RELEASE_SVN_TOKAY Bug: 332726030 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:dc64ebbb620e27b5efda7f7814c3f795efaec58b) Merged-In: I8e2a835fd2887c4e77d95bf0a3bc63a25161b080 Change-Id: I8e2a835fd2887c4e77d95bf0a3bc63a25161b080 --- device-caiman.mk | 9 ++++++++- device-komodo.mk | 9 ++++++++- device-tokay.mk | 9 ++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/device-caiman.mk b/device-caiman.mk index 0bf7d900..90a7150b 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -69,8 +69,15 @@ include device/google/gs-common/modem/radio_ext/radio_ext.mk include device/google/gs-common/pixelsupport/pixelsupport.mk # Increment the SVN for any official public releases +ifdef RELEASE_SVN_CAIMAN +TARGET_SVN ?= $(RELEASE_SVN_CAIMAN) +else +# Set this for older releases that don't use build flag +TARGET_SVN ?= 03 +endif + PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=3 + ro.vendor.build.svn=$(TARGET_SVN) # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,caiman) diff --git a/device-komodo.mk b/device-komodo.mk index 02fea019..deae0497 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -69,8 +69,15 @@ include device/google/gs-common/modem/radio_ext/radio_ext.mk include device/google/gs-common/pixelsupport/pixelsupport.mk # Increment the SVN for any official public releases +ifdef RELEASE_SVN_KOMODO +TARGET_SVN ?= $(RELEASE_SVN_KOMODO) +else +# Set this for older releases that don't use build flag +TARGET_SVN ?= 03 +endif + PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=3 + ro.vendor.build.svn=$(TARGET_SVN) # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,komodo) diff --git a/device-tokay.mk b/device-tokay.mk index fed02005..2df48d0b 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -59,8 +59,15 @@ include device/google/gs-common/modem/radio_ext/radio_ext.mk include device/google/gs-common/pixelsupport/pixelsupport.mk # Increment the SVN for any official public releases +ifdef RELEASE_SVN_TOKAY +TARGET_SVN ?= $(RELEASE_SVN_TOKAY) +else +# Set this for older releases that don't use build flag +TARGET_SVN ?= 03 +endif + PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=3 + ro.vendor.build.svn=$(TARGET_SVN) # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,tokay) From 67bb9c0854b4068f6d2f6d66c1c4f3bfb2df0988 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Mon, 22 Jul 2024 03:46:43 +0000 Subject: [PATCH 4/4] Update P24 SVN to 4 Bug: 350826665 Flag: build.RELEASE_SVN_CAIMAN Flag: build.RELEASE_SVN_KOMODO Flag: build.RELEASE_SVN_TOKAY (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1a61f943a766179084e4e483ec876a60421d84f1) Merged-In: I5de5e88e286aea0a5d5786e7f84732f947a88449 Change-Id: I5de5e88e286aea0a5d5786e7f84732f947a88449 --- device-caiman.mk | 2 +- device-komodo.mk | 2 +- device-tokay.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/device-caiman.mk b/device-caiman.mk index 90a7150b..4b833252 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -73,7 +73,7 @@ ifdef RELEASE_SVN_CAIMAN TARGET_SVN ?= $(RELEASE_SVN_CAIMAN) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 03 +TARGET_SVN ?= 04 endif PRODUCT_VENDOR_PROPERTIES += \ diff --git a/device-komodo.mk b/device-komodo.mk index deae0497..30d54d61 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -73,7 +73,7 @@ ifdef RELEASE_SVN_KOMODO TARGET_SVN ?= $(RELEASE_SVN_KOMODO) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 03 +TARGET_SVN ?= 04 endif PRODUCT_VENDOR_PROPERTIES += \ diff --git a/device-tokay.mk b/device-tokay.mk index 2df48d0b..c65bc593 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -63,7 +63,7 @@ ifdef RELEASE_SVN_TOKAY TARGET_SVN ?= $(RELEASE_SVN_TOKAY) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 03 +TARGET_SVN ?= 04 endif PRODUCT_VENDOR_PROPERTIES += \