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

Commit 0645253c authored by Alex Buynytskyy's avatar Alex Buynytskyy
Browse files

Force all temp artifacts to out/dist. 

This way they don't end up in the final build, and will be in a single
predictable place.

+bump the extension SDK version to 7

Bug: 271806061
Test: run locally
Change-Id: Iaf4d918a269cdb7c79a53b7df9592bf8205e0305
parent e54084b5

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

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

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



    # default target to modify tree and build SDK

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



    # SDK codename -> int

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

tools/finalization/build-step-1.sh

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

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



    # default target to modify tree and build SDK

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



    # Build finalization artifacts.

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

}

tools/finalization/environment.sh

+2 −2
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ set -ex 
export FINAL_BUG_ID='0'



export FINAL_PLATFORM_CODENAME='UpsideDownCake'

export CURRENT_PLATFORM_CODENAME='VanillaIceCream'

export CURRENT_PLATFORM_CODENAME='UpsideDownCake'

export FINAL_PLATFORM_CODENAME_JAVA='UPSIDE_DOWN_CAKE'

export FINAL_PLATFORM_SDK_VERSION='34'

export FINAL_PLATFORM_VERSION='14'



export FINAL_BUILD_PREFIX='UP1A'



export FINAL_MAINLINE_EXTENSION='6'
 
 No newline at end of file
 
export FINAL_MAINLINE_EXTENSION='7'
 
 No newline at end of file

tools/finalization/finalize-aidl-vndk-sdk-resources.sh

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ function finalize_aidl_vndk_sdk_resources() { 
    local SDK_VERSION="public static final int $FINAL_PLATFORM_CODENAME_JAVA = $FINAL_PLATFORM_SDK_VERSION;"



    # default target to modify tree and build SDK

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

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



    # The full process can be found at (INTERNAL) go/android-sdk-finalization.

tools/finalization/finalize-sdk-rel.sh

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ function finalize_sdk_rel() { 
    source $top/build/make/tools/finalization/environment.sh



    # default target to modify tree and build SDK

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

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



    # revert droidstubs hack now we are switching to REL

    revert_droidstubs_hack