From 0645253ceb47536b045ce24124db834371274619 Mon Sep 17 00:00:00 2001 From: Alex Buynytskyy Date: Mon, 6 Mar 2023 10:26:08 +0000 Subject: [PATCH] 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 --- tools/finalization/build-step-1-and-2.sh | 3 --- tools/finalization/build-step-1.sh | 3 --- tools/finalization/environment.sh | 4 ++-- tools/finalization/finalize-aidl-vndk-sdk-resources.sh | 2 +- tools/finalization/finalize-sdk-rel.sh | 2 +- tools/finalization/localonly-finalize-mainline-sdk.sh | 7 +++---- 6 files changed, 7 insertions(+), 14 deletions(-) diff --git a/tools/finalization/build-step-1-and-2.sh b/tools/finalization/build-step-1-and-2.sh index eaaf0cd3a4..1b749b106f 100755 --- a/tools/finalization/build-step-1-and-2.sh +++ b/tools/finalization/build-step-1-and-2.sh @@ -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 diff --git a/tools/finalization/build-step-1.sh b/tools/finalization/build-step-1.sh index edf497ed03..a8d590f4a6 100755 --- a/tools/finalization/build-step-1.sh +++ b/tools/finalization/build-step-1.sh @@ -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 } diff --git a/tools/finalization/environment.sh b/tools/finalization/environment.sh index 983e19dc4a..14951b8628 100755 --- a/tools/finalization/environment.sh +++ b/tools/finalization/environment.sh @@ -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 diff --git a/tools/finalization/finalize-aidl-vndk-sdk-resources.sh b/tools/finalization/finalize-aidl-vndk-sdk-resources.sh index aace6738bc..cdc2e3a197 100755 --- a/tools/finalization/finalize-aidl-vndk-sdk-resources.sh +++ b/tools/finalization/finalize-aidl-vndk-sdk-resources.sh @@ -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. diff --git a/tools/finalization/finalize-sdk-rel.sh b/tools/finalization/finalize-sdk-rel.sh index 56f3bc3c87..5cc90cf06c 100755 --- a/tools/finalization/finalize-sdk-rel.sh +++ b/tools/finalization/finalize-sdk-rel.sh @@ -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 diff --git a/tools/finalization/localonly-finalize-mainline-sdk.sh b/tools/finalization/localonly-finalize-mainline-sdk.sh index 104b6acb04..f614fc11b9 100755 --- a/tools/finalization/localonly-finalize-mainline-sdk.sh +++ b/tools/finalization/localonly-finalize-mainline-sdk.sh @@ -7,14 +7,13 @@ function finalize_locally_mainline_sdk() { source $top/build/make/tools/finalization/environment.sh # Build Platform SDKs. - $top/build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=sdk TARGET_BUILD_VARIANT=userdebug sdk dist sdk_repo + $top/build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=sdk TARGET_BUILD_VARIANT=userdebug sdk dist sdk_repo DIST_DIR=out/dist # Build Modules SDKs. - TARGET_BUILD_VARIANT=userdebug UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true "$top/vendor/google/build/mainline_modules_sdks.sh" + TARGET_BUILD_VARIANT=userdebug UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true DIST_DIR=out/dist "$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" -W ignore::DeprecationWarning "$top/prebuilts/sdk/update_prebuilts.py" --local_mode -f ${FINAL_PLATFORM_SDK_VERSION} -e ${FINAL_MAINLINE_EXTENSION} --bug 1 1 } finalize_locally_mainline_sdk