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

Commit 4d4b5802 authored by Steven Moreland's avatar Steven Moreland
Browse files

finalize_branch_for_release.sh: avoid envsetup.sh 

Avoid envsetup.sh, which is configuring the environment in a
way that breaks builds on the build servers. This exposes an
issue with the AIDL freeze that was lost in the meantime.

Bug: 234734342
Test: (run script, there is an audio failure)
Change-Id: Ic2888fb316d295a06f465f33d3a6f348a65c30a5
parent 3eb3ca0c

finalize_branch_for_release.sh

+23 −19
Original line number Diff line number Diff line 
#!/bin/bash



set -e

set -ex



source "$(dirname "$0")"/envsetup.sh

function finalize_main() {

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



    # default target to modify tree and build SDK

lunch aosp_arm64-userdebug



set -x

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



    # This script is WIP and only finalizes part of the Android branch for release.

    # The full process can be found at (INTERNAL) go/android-sdk-finalization.
@@ -17,14 +16,19 @@ set -x 
    # Update references in the codebase to new API version (TODO)

    # ...



AIDL_TRANSITIVE_FREEZE=true m aidl-freeze-api

    AIDL_TRANSITIVE_FREEZE=true $m aidl-freeze-api



m check-vndk-list || update-vndk-list.sh # for new versions of AIDL interfaces

    # Update new versions of files. See update-vndk-list.sh (which requires envsetup.sh)

    $m check-vndk-list || \

        { cp $top/out/soong/vndk/vndk.libraries.txt $top/build/make/target/product/gsi/current.txt; }



    # for now, we simulate the release state for AIDL, but in the future, we would want

    # to actually turn the branch into the REL state and test with that

AIDL_FROZEN_REL=true m # test build

    AIDL_FROZEN_REL=true $m nothing # test build



    # Build SDK (TODO)

    # lunch sdk...

    # m ...

}



finalize_main