Finalization bugfixes.

- keep previous platform versions in platform_releases.txt,
- fix for the build version test,
- after discussion with Yuri, keep non-REL resource sdk_int the same.

Bug: 323940469
Test: local run
Ignore-AOSP-First: release configs present in internal repo only
Change-Id: I6637e109191480ded615ef35c9185d927ddaec40
This commit is contained in:
Alex Buynytskyy
2024-03-11 18:14:52 +00:00
parent f85c0c6433
commit 4fb99d85e6
6 changed files with 16 additions and 76 deletions

View File

@@ -21,15 +21,17 @@ function finalize_step_1_main() {
local top="$(dirname "$0")"/../../../..
source $top/build/make/tools/finalization/environment.sh
local m="$top/build/soong/soong_ui.bash --make-mode TARGET_RELEASE=next TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug"
source $top/build/make/tools/finalization/finalize-sdk-resources.sh
# move all changes to finalization branch/topic and upload to gerrit
commit_step_1_changes
# build to confirm everything is OK
AIDL_FROZEN_REL=true $m
local m_next="$top/build/soong/soong_ui.bash --make-mode TARGET_RELEASE=next TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug"
AIDL_FROZEN_REL=true $m_next
local m_fina="$top/build/soong/soong_ui.bash --make-mode TARGET_RELEASE=fina_1 TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug"
AIDL_FROZEN_REL=true $m_fina
}
finalize_step_1_main