Merge "Script updates." am: b2be62551c am: acd53a5601 am: af7728ebfe

Original change: https://android-review.googlesource.com/c/platform/build/+/2530965

Change-Id: Id486c502493f8bfe0658ac590e0998e0f9548f46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-04-12 03:15:03 +00:00 committed by Automerger Merge Worker
commit 7778c6e0c4
6 changed files with 31 additions and 10 deletions

View file

@ -6,14 +6,18 @@ function finalize_main_step12() {
local top="$(dirname "$0")"/../../../..
source $top/build/make/tools/finalization/environment.sh
# SDK codename -> int
source $top/build/make/tools/finalization/finalize-aidl-vndk-sdk-resources.sh
if [ "$FINAL_STATE" = "unfinalized" ] ; then
# SDK codename -> int
source $top/build/make/tools/finalization/finalize-aidl-vndk-sdk-resources.sh
fi;
# ADB, Platform/Mainline SDKs build and move to prebuilts
source $top/build/make/tools/finalization/localonly-steps.sh
if [ "$FINAL_STATE" = "unfinalized" ] || [ "$FINAL_STATE" = "sdk" ] ; then
# ADB, Platform/Mainline SDKs build and move to prebuilts
source $top/build/make/tools/finalization/localonly-steps.sh
# REL
source $top/build/make/tools/finalization/finalize-sdk-rel.sh
# REL
source $top/build/make/tools/finalization/finalize-sdk-rel.sh
fi;
}
finalize_main_step12

View file

@ -6,8 +6,11 @@ function finalize_main_step1() {
local top="$(dirname "$0")"/../../../..
source $top/build/make/tools/finalization/environment.sh
# Build finalization artifacts.
source $top/build/make/tools/finalization/finalize-aidl-vndk-sdk-resources.sh
if [ "$FINAL_STATE" = "unfinalized" ] ; then
# Build finalization artifacts.
# source $top/build/make/tools/finalization/finalize-aidl-vndk-sdk-resources.sh
echo "Build finalization artifacts."
fi;
}
finalize_main_step1

View file

@ -12,4 +12,10 @@ export FINAL_PLATFORM_VERSION='14'
export FINAL_BUILD_PREFIX='UP1A'
export FINAL_MAINLINE_EXTENSION='7'
export FINAL_MAINLINE_EXTENSION='7'
# Options:
# 'unfinalized' - branch is in development state,
# 'sdk' - SDK/API is finalized
# 'rel' - branch is finalized, switched to REL
export FINAL_STATE='unfinalized'

View file

@ -9,7 +9,7 @@ function commit_step_1_changes() {
if [[ $(git status --short) ]]; then
repo start "$FINAL_PLATFORM_CODENAME-SDK-Finalization" ;
git add -A . ;
git commit -m "$FINAL_PLATFORM_CODENAME is now $FINAL_PLATFORM_SDK_VERSION" \
git commit -m "$FINAL_PLATFORM_CODENAME is now $FINAL_PLATFORM_SDK_VERSION and extension version $FINAL_MAINLINE_EXTENSION" \
-m "Ignore-AOSP-First: $FINAL_PLATFORM_CODENAME Finalization
Bug: $FINAL_BUG_ID
Test: build";

3
tools/finalization/update-step-1.sh Normal file → Executable file
View file

@ -1,6 +1,9 @@
#!/bin/bash
# Script to perform a 1st step of Android Finalization: API/SDK finalization, update CLs and upload to Gerrit.
# WIP, does not work yet
exit 10
set -ex
function update_step_1_changes() {

View file

@ -1,6 +1,11 @@
#!/bin/bash
# Script to perform a 2nd step of Android Finalization: REL finalization, create CLs and upload to Gerrit.
# WIP, does not work yet
exit 10
set -ex
function update_step_2_changes() {
set +e
repo forall -c '\