From 13b74ca287f219d023b3b3659655f8375a355ab1 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Wed, 3 Jul 2024 02:07:34 +0000 Subject: [PATCH 1/4] Update SVN to 2 Bug: 350826665 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:85585670a3f6e17eae014fd0256854c5fc423543) Merged-In: Ib45615fcb7e1e71db10764a447db523b8f7b9a9a Change-Id: Ib45615fcb7e1e71db10764a447db523b8f7b9a9a --- device-comet.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-comet.mk b/device-comet.mk index 21f3428..eb6b2d0 100644 --- a/device-comet.mk +++ b/device-comet.mk @@ -70,7 +70,7 @@ include device/google/gs-common/display/dump_second_display.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,comet) From 3df9f5ad374296d7646a4591a6da8b8a697422c3 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Fri, 5 Jul 2024 01:03:03 +0000 Subject: [PATCH 2/4] Update SVN to 3 Bug: 350826665 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:44ab63212c04558980956afb90fa1bc0cc76d0ef) Merged-In: I61495499ba6b1932a53ddae460cab8f9541a13f1 Change-Id: I61495499ba6b1932a53ddae460cab8f9541a13f1 --- device-comet.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-comet.mk b/device-comet.mk index eb6b2d0..692d165 100644 --- a/device-comet.mk +++ b/device-comet.mk @@ -70,7 +70,7 @@ include device/google/gs-common/display/dump_second_display.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,comet) From 3678880f3578d8e49727b3561fddcb1f1729e75d Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Wed, 10 Jul 2024 21:22:19 +0000 Subject: [PATCH 3/4] comet: Use build_flags for SVN Flag: build.RELEASE_SVN_COMET Bug: 332726030 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:828996398553b6229239c1e43d53dcbc2ff49e6c) Merged-In: Ie851e0f40fa5d44d7632978d0735da803394e6d0 Change-Id: Ie851e0f40fa5d44d7632978d0735da803394e6d0 --- device-comet.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/device-comet.mk b/device-comet.mk index 692d165..718f602 100644 --- a/device-comet.mk +++ b/device-comet.mk @@ -69,8 +69,15 @@ include device/google/gs-common/touch/gti/predump_gti_dual.mk include device/google/gs-common/display/dump_second_display.mk # Increment the SVN for any official public releases +ifdef RELEASE_SVN_COMET +TARGET_SVN ?= $(RELEASE_SVN_COMET) +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,comet) From 1a4960969484de7b0ca77e3380e1a15eaec0818a Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Mon, 22 Jul 2024 03:48:48 +0000 Subject: [PATCH 4/4] Update Comet SVN to 4 Bug: 350826665 Flag: build.RELEASE_SVN_COMET (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5bd46d2188f684c4ea1f83976a53039e794e530c) Merged-In: Ic5d7655e514cafc5bcfafbcfebfec7023cf0330d Change-Id: Ic5d7655e514cafc5bcfafbcfebfec7023cf0330d --- device-comet.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-comet.mk b/device-comet.mk index 718f602..26837e9 100644 --- a/device-comet.mk +++ b/device-comet.mk @@ -73,7 +73,7 @@ ifdef RELEASE_SVN_COMET TARGET_SVN ?= $(RELEASE_SVN_COMET) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 03 +TARGET_SVN ?= 04 endif PRODUCT_VENDOR_PROPERTIES += \