From 48d64b886a9affd9116c9963d061751c98cdefef Mon Sep 17 00:00:00 2001 From: Alex Buynytskyy Date: Mon, 4 Dec 2023 23:13:39 +0000 Subject: [PATCH] Add the next release to Class2NonSdkList. Fixes: 313893203 Test: step-1 Change-Id: I0f6ae822cd206df23a2ffd1dade78bb430006c5d --- tools/finalization/README.md | 6 ++---- tools/finalization/finalize-aidl-vndk-sdk-resources.sh | 7 +++++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/finalization/README.md b/tools/finalization/README.md index 501f2605a8..cc97d1f4a5 100644 --- a/tools/finalization/README.md +++ b/tools/finalization/README.md @@ -12,10 +12,8 @@ This folder contains automation and CI scripts for [finalizing](https://go/andro ## CI: Performed in build targets in Finalization branches. -1. [Finalization Step 1 for Main, git_main-fina-1-release](https://android-build.googleplex.com/builds/branches/git_main-fina-1-release/grid). Test [1st step/Finalize SDK](./finalize-aidl-vndk-sdk-resources.sh). -2. [Finalization Step 1 for UDC, git_udc-fina-1-release](https://android-build.googleplex.com/builds/branches/git_udc-fina-1-release/grid). Same but for udc-dev. -3. [Finalization Step 2 for Main, git_main-fina-2-release](https://android-build.googleplex.com/builds/branches/git_main-fina-2-release/grid). Test [1st step/Finalize SDK](./finalize-aidl-vndk-sdk-resources.sh) and [2nd step/Finalize Android](./finalize-sdk-rel.sh). Use [local finalization](./localonly-steps.sh) to build and copy presubmits. -4. [Finalization Step 2 for UDC, git_udc-fina-2-release](https://android-build.googleplex.com/builds/branches/git_udc-fina-2-release/grid). Same but for udc-dev. +1. [Finalization Step 1, git_main-fina-1-release](https://android-build.corp.google.com/build_explorer/branch/git_main-fina-1-release). Test [1st step/Finalize SDK](./finalize-aidl-vndk-sdk-resources.sh). +3. [Finalization Step 2, git_main-fina-2-release](https://android-build.corp.google.com/build_explorer/branch/git_main-fina-2-release). Test [1st step/Finalize SDK](./finalize-aidl-vndk-sdk-resources.sh) and [2nd step/Finalize Android](./finalize-sdk-rel.sh). Use [local finalization](./localonly-steps.sh) to build and copy presubmits. 5. [Local finalization steps](./localonly-steps.sh) are done only during local testing or in the CI lab. Normally these steps use artifacts from other builds. ## Utility: diff --git a/tools/finalization/finalize-aidl-vndk-sdk-resources.sh b/tools/finalization/finalize-aidl-vndk-sdk-resources.sh index 6d13325ee1..37c00117fc 100755 --- a/tools/finalization/finalize-aidl-vndk-sdk-resources.sh +++ b/tools/finalization/finalize-aidl-vndk-sdk-resources.sh @@ -137,6 +137,13 @@ function finalize_aidl_vndk_sdk_resources() { local version_codes="$top/platform_testing/libraries/compatibility-common-util/src/com/android/compatibility/common/util/VersionCodes.java" sed -i -e "/=.*$((${FINAL_PLATFORM_SDK_VERSION}-1));/a \\ ${SDK_VERSION}" $version_codes + # tools/platform-compat + local class2nonsdklist="$top/tools/platform-compat/java/com/android/class2nonsdklist/Class2NonSdkList.java" + if ! grep -q "\.*map.put($((${FINAL_PLATFORM_SDK_VERSION}))" $class2nonsdklist ; then + local sdk_version="map.put(${FINAL_PLATFORM_SDK_VERSION}, FLAG_UNSUPPORTED);" + sed -i -e "/.*map.put($((${FINAL_PLATFORM_SDK_VERSION}-1))/a \\ ${sdk_version}" $class2nonsdklist + fi + # Finalize resources "$top/frameworks/base/tools/aapt2/tools/finalize_res.py" \ "$top/frameworks/base/core/res/res/values/public-staging.xml" \