diff options
| author | 2024-11-21 16:20:12 +0900 | |
|---|---|---|
| committer | 2024-11-21 16:28:16 +0900 | |
| commit | b9c461db08dd4c8940d9458e15f1d7a6ad389c15 (patch) | |
| tree | e0a47f7d4adfc0ce2b7ded359f4a3c55cf709e8f | |
| parent | b1d5be1c38033af4803c24112024c3e050c1caaf (diff) | |
Update vendor_api_levels.go with the vintf finalization
vendor_api_levels.go provides corresponding SDK version for vendor
API levels. After the finalization, we will have the next vendor API
level for the trunk_staging build.
We may change the map file when the version is changed later, but
must provide an SDK version for the next vendor API level for the
trunk_staging build.
Ignore-AOSP-First: finalization script is an exception
Bug: 331696132
Test: build/make/tools/finalization/build-step-0.sh
Change-Id: I6788add9e2177cc9d2fc63f54e032f5fc3ecf9b9
| -rwxr-xr-x | tools/finalization/environment.sh | 1 | ||||
| -rwxr-xr-x | tools/finalization/finalize-vintf-resources.sh | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/tools/finalization/environment.sh b/tools/finalization/environment.sh index cf3e61bd99..9a287c4666 100755 --- a/tools/finalization/environment.sh +++ b/tools/finalization/environment.sh @@ -34,3 +34,4 @@ export FINAL_CORRESPONDING_VERSION_LETTER='W' export FINAL_CORRESPONDING_PLATFORM_VERSION='16' export FINAL_NEXT_BOARD_API_LEVEL='202604' export FINAL_NEXT_CORRESPONDING_VERSION_LETTER='X' +export FINAL_NEXT_CORRESPONDING_SDK_VERSION='37' diff --git a/tools/finalization/finalize-vintf-resources.sh b/tools/finalization/finalize-vintf-resources.sh index 6f1a6f646e..45efc104db 100755 --- a/tools/finalization/finalize-vintf-resources.sh +++ b/tools/finalization/finalize-vintf-resources.sh @@ -16,6 +16,13 @@ function finalize_vintf_resources() { export TARGET_RELEASE=fina_0 export TARGET_PRODUCT=aosp_arm64 + # build/soong + local vendor_api_level_map="case ${FINAL_NEXT_BOARD_API_LEVEL}:" + if ! grep -q "$vendor_api_level_map" "$top/build/soong/android/vendor_api_levels.go" ; then + sed -i -e "/case ${FINAL_BOARD_API_LEVEL}:/{N;a \\\t$vendor_api_level_map\n\t\tsdkVersion = ${FINAL_NEXT_CORRESPONDING_SDK_VERSION} + }" "$top/build/soong/android/vendor_api_levels.go" + fi + # system/sepolicy "$top/system/sepolicy/tools/finalize-vintf-resources.sh" "$top" "$FINAL_BOARD_API_LEVEL" |