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
diff --git a/tools/finalization/build-step-1-and-m.sh b/tools/finalization/build-step-1-and-m.sh
index 0e7129f..88bb347 100755
--- a/tools/finalization/build-step-1-and-m.sh
+++ b/tools/finalization/build-step-1-and-m.sh
@@ -9,10 +9,9 @@
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 38fdb05..f883bca 100755
--- a/tools/finalization/dryrun-step-1-and-2.sh
+++ b/tools/finalization/dryrun-step-1-and-2.sh
@@ -30,10 +30,10 @@
# 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 d889395..0f2bc63 100755
--- a/tools/finalization/dryrun-step-1.sh
+++ b/tools/finalization/dryrun-step-1.sh
@@ -26,10 +26,10 @@
# 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 ea947b9..adc917e 100755
--- a/tools/finalization/step-1.sh
+++ b/tools/finalization/step-1.sh
@@ -29,10 +29,10 @@
# 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 d07989e..862c8f5 100755
--- a/tools/finalization/step-2.sh
+++ b/tools/finalization/step-2.sh
@@ -28,10 +28,10 @@
# 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 $@