Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53be8241 authored by Mårten Kongstad's avatar Mårten Kongstad Committed by Android (Google) Code Review
Browse files

Merge "finalization: use same repo branch during dry-run" into main

parents 19a66381 6c6a1b5b

tools/finalization/command-line-options.sh

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ ARGV=$(getopt --options '' --long dry-run -- "$@") 
eval set -- "$ARGV"

while true; do

    case "$1" in

        --dry-run) repo_upload_dry_run_arg="--dry-run"; shift ;;

        --dry-run) repo_upload_dry_run_arg="--dry-run"; repo_branch="finalization-dry-run"; shift ;;

        *) break

    esac

done

tools/finalization/step-0.sh

+3 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ function commit_step_0_changes() { 
    set +e

    repo forall -c '\

        if [[ $(git status --short) ]]; then

            repo start "VINTF-$FINAL_BOARD_API_LEVEL-Finalization" ;

            repo start "'$repo_branch'" ;

            git add -A . ;

            git commit -m "Vendor API level $FINAL_BOARD_API_LEVEL is now frozen" \

                       -m "Ignore-AOSP-First: VINTF $FINAL_BOARD_API_LEVEL Finalization
@@ -21,8 +21,9 @@ Test: build"; 


function finalize_step_0_main() {

    local top="$(dirname "$0")"/../../../..

    source $top/build/make/tools/finalization/command-line-options.sh

    source $top/build/make/tools/finalization/environment.sh

    local repo_branch="VINTF-$FINAL_BOARD_API_LEVEL-Finalization"

    source $top/build/make/tools/finalization/command-line-options.sh



    local m="$top/build/soong/soong_ui.bash --make-mode TARGET_RELEASE=next TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug"

tools/finalization/step-1.sh

+3 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ function commit_step_1_changes() { 
    set +e

    repo forall -c '\

        if [[ $(git status --short) ]]; then

            repo start "$FINAL_PLATFORM_CODENAME-SDK-Finalization" ;

            repo start "'$repo_branch'" ;

            git add -A . ;

            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
@@ -19,8 +19,9 @@ Test: build"; 


function finalize_step_1_main() {

    local top="$(dirname "$0")"/../../../..

    source $top/build/make/tools/finalization/command-line-options.sh

    source $top/build/make/tools/finalization/environment.sh

    local repo_branch="$FINAL_PLATFORM_CODENAME-SDK-Finalization"

    source $top/build/make/tools/finalization/command-line-options.sh



    source $top/build/make/tools/finalization/finalize-sdk-resources.sh

tools/finalization/step-2.sh

+3 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
function commit_step_2_changes() {

    repo forall -c '\

        if [[ $(git status --short) ]]; then

            repo start "$FINAL_PLATFORM_CODENAME-SDK-Finalization-Rel" ;

            repo start "'$repo_branch'" ;

            git add -A . ;

            git commit -m "$FINAL_PLATFORM_CODENAME/$FINAL_PLATFORM_SDK_VERSION is now REL" \

                       -m "Ignore-AOSP-First: $FINAL_PLATFORM_CODENAME Finalization
@@ -17,8 +17,9 @@ Test: build"; 


function finalize_step_2_main() {

    local top="$(dirname "$0")"/../../../..

    source $top/build/make/tools/finalization/command-line-options.sh

    source $top/build/make/tools/finalization/environment.sh

    local repo_branch="$FINAL_PLATFORM_CODENAME-SDK-Finalization-Rel"

    source $top/build/make/tools/finalization/command-line-options.sh



    # prebuilts etc

    source $top/build/make/tools/finalization/finalize-sdk-rel.sh