Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48d64b88 authored by Alex Buynytskyy's avatar Alex Buynytskyy
Browse files

Add the next release to Class2NonSdkList. 

Fixes: 313893203
Test: step-1
Change-Id: I0f6ae822cd206df23a2ffd1dade78bb430006c5d
parent 35ce86d6

tools/finalization/README.md

+2 −4
Original line number Diff line number Diff line
@@ -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:

tools/finalization/finalize-aidl-vndk-sdk-resources.sh

+7 −0
Original line number Diff line number Diff line
@@ -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" \