From 920037c8d2bf9fbf8bd4e78a47aefc75dc1436e2 Mon Sep 17 00:00:00 2001 From: Devin Moore Date: Fri, 5 Apr 2024 15:32:38 +0000 Subject: [PATCH] Remove AIDL_FROZEN_REL from step-1/step-2 finalization That variable is used to ensure all VINTF interfaces are frozen and is needed for vFRC/VINTF finalization is step-0. Since SDK finalization (step-1 and step-2) are done at a different time, they shouldn't care about unfrozen VINTF interfaces. Ignore-AOSP-First: b/304316873#comment10 Test: na Bug: 333039895 Change-Id: Ica6807599d5b18078ecea96d939e147d4785749e --- tools/finalization/build-step-1-and-m.sh | 3 +-- tools/finalization/dryrun-step-1-and-2.sh | 4 ++-- tools/finalization/dryrun-step-1.sh | 4 ++-- tools/finalization/step-1.sh | 4 ++-- tools/finalization/step-2.sh | 4 ++-- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/tools/finalization/build-step-1-and-m.sh b/tools/finalization/build-step-1-and-m.sh index 0e7129f342..88bb3474d2 100755 --- a/tools/finalization/build-step-1-and-m.sh +++ b/tools/finalization/build-step-1-and-m.sh @@ -9,10 +9,9 @@ function finalize_main_step1_and_m() { local m="$top/build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug" # This command tests: - # The release state for AIDL. # ABI difference between user and userdebug builds. # Resource/SDK finalization. - AIDL_FROZEN_REL=true $m + $m } finalize_main_step1_and_m diff --git a/tools/finalization/dryrun-step-1-and-2.sh b/tools/finalization/dryrun-step-1-and-2.sh index 38fdb0595b..f883bca673 100755 --- a/tools/finalization/dryrun-step-1-and-2.sh +++ b/tools/finalization/dryrun-step-1-and-2.sh @@ -30,10 +30,10 @@ function finalize_step_2_main() { # build to confirm everything is OK local m_next="$top/build/soong/soong_ui.bash --make-mode TARGET_RELEASE=next TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug" - AIDL_FROZEN_REL=true $m_next + $m_next local m_fina="$top/build/soong/soong_ui.bash --make-mode TARGET_RELEASE=fina_2 TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug" - AIDL_FROZEN_REL=true $m_fina + $m_fina } finalize_step_2_main diff --git a/tools/finalization/dryrun-step-1.sh b/tools/finalization/dryrun-step-1.sh index d8893953ab..0f2bc635a0 100755 --- a/tools/finalization/dryrun-step-1.sh +++ b/tools/finalization/dryrun-step-1.sh @@ -26,10 +26,10 @@ function finalize_step_1_main() { # build to confirm everything is OK local m_next="$top/build/soong/soong_ui.bash --make-mode TARGET_RELEASE=next TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug" - AIDL_FROZEN_REL=true $m_next + $m_next local m_fina="$top/build/soong/soong_ui.bash --make-mode TARGET_RELEASE=fina_1 TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug" - AIDL_FROZEN_REL=true $m_fina + $m_fina } finalize_step_1_main diff --git a/tools/finalization/step-1.sh b/tools/finalization/step-1.sh index ea947b95a6..adc917e8de 100755 --- a/tools/finalization/step-1.sh +++ b/tools/finalization/step-1.sh @@ -29,10 +29,10 @@ function finalize_step_1_main() { # build to confirm everything is OK local m_next="$top/build/soong/soong_ui.bash --make-mode TARGET_RELEASE=next TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug" - AIDL_FROZEN_REL=true $m_next + $m_next local m_fina="$top/build/soong/soong_ui.bash --make-mode TARGET_RELEASE=fina_1 TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug" - AIDL_FROZEN_REL=true $m_fina + $m_fina } finalize_step_1_main $@ diff --git a/tools/finalization/step-2.sh b/tools/finalization/step-2.sh index d07989e888..862c8f5217 100755 --- a/tools/finalization/step-2.sh +++ b/tools/finalization/step-2.sh @@ -28,10 +28,10 @@ function finalize_step_2_main() { # build to confirm everything is OK local m_next="$top/build/soong/soong_ui.bash --make-mode TARGET_RELEASE=next TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug" - AIDL_FROZEN_REL=true $m_next + $m_next local m_fina="$top/build/soong/soong_ui.bash --make-mode TARGET_RELEASE=fina_2 TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug" - AIDL_FROZEN_REL=true $m_fina + $m_fina } finalize_step_2_main $@