commit 0fa58fa21d2ea8a38cb8dae1cae0756b56549953
author Alex Buynytskyy <alexbuy@google.com> Mon Feb 13 20:22:10 2023 +0000
committer Alex Buynytskyy <alexbuy@google.com> Tue Feb 14 00:14:19 2023 +0000
tree 531765b42ac042fb659d72015e570a489f80e392
parent 2857d266088e45079cbf9677bc1a5f00a5eba9b5

More finalization script fixes.

+ add an automation for bionic api-levels.h

Bug: 264308911
Test: local runs
Change-Id: I6ee24fce9b6de1b9bc1ddecde7b05c2e58002b9e

tools/finalization/step-2.sh

diff --git a/tools/finalization/step-2.sh b/tools/finalization/step-2.sh
index 9c68988..926b850 100755
--- a/tools/finalization/step-2.sh
+++ b/tools/finalization/step-2.sh
@@ -4,11 +4,11 @@
 function commit_step_2_changes() {
     repo forall -c '\
         if [[ $(git status --short) ]]; then
-            repo start "$FINA_PLATFORM_CODENAME-SDK-Finalization-Rel" ;
+            repo start "$FINAL_PLATFORM_CODENAME-SDK-Finalization-Rel" ;
             git add -A . ;
-            git commit -m "$FINA_PLATFORM_CODENAME/$FINA_PLATFORM_SDK_VERSION is now REL" \
-                       -m "Ignore-AOSP-First: $FINA_PLATFORM_CODENAME Finalization
-Bug: $FINA_BUG_ID
+            git commit -m "$FINAL_PLATFORM_CODENAME/$FINAL_PLATFORM_SDK_VERSION is now REL" \
+                       -m "Ignore-AOSP-First: $FINAL_PLATFORM_CODENAME Finalization
+Bug: $FINAL_BUG_ID
 Test: build";
 
             repo upload --cbr --no-verify -o nokeycheck -t -y . ;
@@ -26,7 +26,7 @@
     source $top/build/make/tools/finalization/finalize-sdk-rel.sh
 
     # Update prebuilts.
-    "$top/prebuilts/build-tools/path/linux-x86/python3" "$top/packages/modules/common/tools/finalize_sdk.py" -b ${FINA_BUG_ID} -f ${FINA_MAINLINE_EXTENSION} -r "${FINA_MAINLINE_SDK_COMMIT_MESSAGE}" ${FINA_MAINLINE_SDK_BUILD_ID}
+    "$top/prebuilts/build-tools/path/linux-x86/python3" "$top/packages/modules/common/tools/finalize_sdk.py" -b ${FINAL_BUG_ID} -f ${FINAL_MAINLINE_EXTENSION} -r "${FINAL_MAINLINE_SDK_COMMIT_MESSAGE}" ${FINAL_MAINLINE_SDK_BUILD_ID}
 
     # build to confirm everything is OK
     AIDL_FROZEN_REL=true $m