tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove AIDL_FROZEN_REL from step-1/step-2 finalization

Browse source 
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
This commit is contained in:
Devin Moore 2024-04-05 15:32:38 +00:00
parent 7faba1cdc4
commit 920037c8d2
5 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tools/finalization/build-step-1-and-m.sh
View file

@ -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" local m="$top/build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug"
# This command tests: # This command tests:
# The release state for AIDL.
# ABI difference between user and userdebug builds. # ABI difference between user and userdebug builds.
# Resource/SDK finalization. # Resource/SDK finalization.
AIDL_FROZEN_REL=true $m $m
} }
finalize_main_step1_and_m finalize_main_step1_and_m

4
tools/finalization/dryrun-step-1-and-2.sh
View file

@ -30,10 +30,10 @@ function finalize_step_2_main() {
# build to confirm everything is OK # 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" 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" 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 finalize_step_2_main

4
tools/finalization/dryrun-step-1.sh
View file

@ -26,10 +26,10 @@ function finalize_step_1_main() {
# build to confirm everything is OK # 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" 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" 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 finalize_step_1_main

4
tools/finalization/step-1.sh
View file

@ -29,10 +29,10 @@ function finalize_step_1_main() {
# build to confirm everything is OK # 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" 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" 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 $@ finalize_step_1_main $@

4
tools/finalization/step-2.sh
View file

@ -28,10 +28,10 @@ function finalize_step_2_main() {
# build to confirm everything is OK # 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" 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" 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 $@ finalize_step_2_main $@