From 828996398553b6229239c1e43d53dcbc2ff49e6c Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Wed, 10 Jul 2024 21:22:19 +0000 Subject: [PATCH 1/2] comet: Use build_flags for SVN Flag: build.RELEASE_SVN_COMET Bug: 332726030 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 8a4c58c..1fdd01d 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 18bcbf8b902f8ca6bbb8249970961528e53341df Mon Sep 17 00:00:00 2001 From: Meng Wang Date: Fri, 12 Jul 2024 00:03:16 +0000 Subject: [PATCH 2/2] Revert "Enable bootstrap for DVT for convenient testing" This reverts commit 65acbd099653a2b97533366fd2489662ce98dd67. Reason for revert: DVT may be used by RoW carriers for test. Do not want to suddenly enable bootstrap for them and cause confusion. Bug: 343731008 Change-Id: I8419188d3a1d433c52f9ae4eb235afd3bc4d7935 --- conf/init.comet.rc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/conf/init.comet.rc b/conf/init.comet.rc index 704f662..09d29dc 100644 --- a/conf/init.comet.rc +++ b/conf/init.comet.rc @@ -158,6 +158,4 @@ on boot && property:ro.boot.warranty.sku=UVZ setprop setupwizard.feature.provisioning_profile_mode true on boot && property:ro.boot.warranty.sku=UTM setprop setupwizard.feature.provisioning_profile_mode true -# Enable bootstrap for DVT for convenient testing (b/343731008) -on boot && property:ro.boot.hardware.revision=DVT1.0 - setprop setupwizard.feature.provisioning_profile_mode true +