From e0e2f75fc20fe4b070c14cb69bd9492d8b4dcb59 Mon Sep 17 00:00:00 2001 From: Alex Buynytskyy Date: Wed, 6 Mar 2024 20:49:57 +0000 Subject: [PATCH] Prepare for V finalization. Bug: 323940469 Test: run locally Ignore-AOSP-First: local first Change-Id: Ie394523f7ea67a5475ad1af98a0586b4421e4c17 --- tools/finalization/cleanup.sh | 4 ++-- tools/finalization/environment.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/finalization/cleanup.sh b/tools/finalization/cleanup.sh index cd87b1d129..e2a059204e 100755 --- a/tools/finalization/cleanup.sh +++ b/tools/finalization/cleanup.sh @@ -14,8 +14,8 @@ function finalize_revert_local_changes_main() { repo forall -c '\ git checkout . ; git revert --abort ; git clean -fdx ;\ - git checkout @ ; git branch fina-step1 -D ; git reset --hard; \ - repo start fina-step1 ; git checkout @ ; git b fina-step1 -D ;' + git checkout @ --detach ; git branch fina-step1 -D ; git reset --hard; \ + repo start fina-step1 ; git checkout @ --detach ; git b fina-step1 -D ;' } finalize_revert_local_changes_main diff --git a/tools/finalization/environment.sh b/tools/finalization/environment.sh index 7961e8bc3e..cadc26f952 100755 --- a/tools/finalization/environment.sh +++ b/tools/finalization/environment.sh @@ -15,7 +15,7 @@ export FINAL_PLATFORM_VERSION='15' # We might or might not fix this in future, but for now let's keep it +1. export FINAL_PLATFORM_SDK_VERSION='35' # Feel free to randomize once in a while to detect buggy version detection code. -export FINAL_MAINLINE_EXTENSION='58' +export FINAL_MAINLINE_EXTENSION='13' # Options: # 'unfinalized' - branch is in development state,