commit f463a8175c78f0fae6f39a3bba1d395b2c08ea11
author Devin Moore <devinmoore@google.com> Wed Jan 08 19:02:21 2025 +0000
committer Devin Moore <devinmoore@google.com> Thu Jan 09 01:31:16 2025 +0000
tree 010b07d7c30c26f6323c8e6acb464829c19507fd
parent 1d2601d6a1550c08895b5eeaea9fc8aab588825f

Use finalize.py instead of bump.py

The finalization doesn't need to create next year's FCM resources at
this time.

Ignore-AOSP-First: finalization is internal-first
Test: build-step-0.sh
Bug: 388532499

Change-Id: I5db3593cfe9ebd68af9daf23cc7c5047621fd78f

tools/finalization/finalize-vintf-resources.sh

diff --git a/tools/finalization/finalize-vintf-resources.sh b/tools/finalization/finalize-vintf-resources.sh
index 2a92959..c633dab 100755
--- a/tools/finalization/finalize-vintf-resources.sh
+++ b/tools/finalization/finalize-vintf-resources.sh
@@ -41,7 +41,7 @@
     # system/sepolicy
     "$top/system/sepolicy/tools/finalize-vintf-resources.sh" "$top" "$FINAL_BOARD_API_LEVEL"
 
-    create_new_compat_matrix_and_kernel_configs $build_test_only
+    finalize_compat_matrix $build_test_only
 
     # pre-finalization build target (trunk)
     local aidl_m="$top/build/soong/soong_ui.bash --make-mode"
@@ -54,22 +54,11 @@
     fi
 }
 
-function create_new_compat_matrix_and_kernel_configs() {
+function finalize_compat_matrix() {
     local build_test_only=$1
-    # The compatibility matrix versions are bumped during vFRC
-    # These will change every time we have a new vFRC
     local CURRENT_COMPATIBILITY_MATRIX_LEVEL="$FINAL_BOARD_API_LEVEL"
-    local NEXT_COMPATIBILITY_MATRIX_LEVEL="$FINAL_NEXT_BOARD_API_LEVEL"
-    # The kernel configs need the letter of the Android release
-    local CURRENT_RELEASE_LETTER="$FINAL_CORRESPONDING_VERSION_LETTER"
-    local NEXT_RELEASE_LETTER="$FINAL_NEXT_CORRESPONDING_VERSION_LETTER"
 
-
-    # build the targets required before touching the Android.bp/Android.mk files
-    local build_cmd="$top/build/soong/soong_ui.bash --make-mode"
-    $build_cmd bpmodify
-
-    "$top/prebuilts/build-tools/path/linux-x86/python3" "$top/hardware/interfaces/compatibility_matrices/bump.py" "$CURRENT_COMPATIBILITY_MATRIX_LEVEL" "$NEXT_COMPATIBILITY_MATRIX_LEVEL" "$CURRENT_RELEASE_LETTER" "$NEXT_RELEASE_LETTER" "$FINAL_CORRESPONDING_PLATFORM_VERSION"
+    "$top/prebuilts/build-tools/path/linux-x86/python3" "$top/hardware/interfaces/compatibility_matrices/finalize.py" "$CURRENT_COMPATIBILITY_MATRIX_LEVEL"
 
     if ! [ "$build_test_only" = "true" ]; then
         # Freeze the current framework manifest file. This relies on the