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

Commit d98c43c8 authored by Alex Buynytskyy's avatar Alex Buynytskyy
Browse files

Script updates. 

- add a mode to disable finalization steps if they were already merged,
- add the extension version into commit message.

Bug: 243966946
Test: local run
Change-Id: I51505e5d5715b56f3b385d714e1aabaae06f58ed
parent 52fdcf54

tools/finalization/build-step-1-and-2.sh

+10 −6
Original line number Diff line number Diff line
@@ -6,14 +6,18 @@ function finalize_main_step12() { 
    local top="$(dirname "$0")"/../../../..

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



    if [ "$FINAL_STATE" = "unfinalized" ] ; then

        # SDK codename -> int

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

    fi;



    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

    fi;

}



finalize_main_step12

tools/finalization/build-step-1.sh

+5 −2
Original line number Diff line number Diff line
@@ -6,8 +6,11 @@ function finalize_main_step1() { 
    local top="$(dirname "$0")"/../../../..

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



    if [ "$FINAL_STATE" = "unfinalized" ] ; then

        # Build finalization artifacts.

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

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

        echo "Build finalization artifacts."

    fi;

}



finalize_main_step1

tools/finalization/environment.sh

+7 −1
Original line number Diff line number Diff line
@@ -13,3 +13,9 @@ export FINAL_PLATFORM_VERSION='14' 
export FINAL_BUILD_PREFIX='UP1A'



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'

tools/finalization/step-1.sh

+1 −1
Original line number Diff line number Diff line
@@ -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";

tools/finalization/update-step-1.sh

100644 → 100755
+3 −0
Original line number Diff line number Diff line 
#!/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() {