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

Commit 9cb34771 authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Automerger Merge Worker
Browse files

Merge "Finalize SDK in CI using local_mode." am: dc7e98b9 

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



Change-Id: Ifbfceaab5e8136622b78603ce64d3f7b0748af17
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 742b6371 dc7e98b9

tools/finalization/localonly-finalize-mainline-sdk.sh

+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ function finalize_locally_mainline_sdk() { 
    TARGET_BUILD_VARIANT=userdebug UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true "$top/vendor/google/build/mainline_modules_sdks.sh"



    # Update prebuilts.

    "$top/prebuilts/build-tools/path/linux-x86/python3" "$top/packages/modules/common/tools/finalize_sdk.py" -l -b 0 -f ${FINAL_MAINLINE_EXTENSION} -r '' 0

    # "$top/prebuilts/build-tools/path/linux-x86/python3" "$top/prebuilts/sdk/update_prebuilts.py" --local_mode -f ${FINAL_PLATFORM_SDK_VERSION} -e ${FINAL_MAINLINE_EXTENSION} --bug 1 1

    # "$top/prebuilts/build-tools/path/linux-x86/python3" "$top/packages/modules/common/tools/finalize_sdk.py" -l -b 0 -f ${FINAL_MAINLINE_EXTENSION} -r '' 0

    "$top/prebuilts/build-tools/path/linux-x86/python3" "$top/prebuilts/sdk/update_prebuilts.py" --local_mode -f ${FINAL_PLATFORM_SDK_VERSION} -e ${FINAL_MAINLINE_EXTENSION} --bug 1 1

}



finalize_locally_mainline_sdk

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

+1 −1

File changed.

Contains only whitespace changes.

tools/finalization/finalize-sdk-rel.sh

+2 −2

File changed.

Contains only whitespace changes.