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

Commit 77f12153 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Almost fully automated finalization."

parents 8a9dffb9 de37a0e7

finalize-aidl-vndk-sdk-resources.sh

+35 −9
Original line number Diff line number Diff line
@@ -3,8 +3,13 @@ 
set -ex



function finalize_aidl_vndk_sdk_resources() {

    local PLATFORM_CODENAME='UpsideDownCake'

    local PLATFORM_CODENAME_JAVA='UPSIDE_DOWN_CAKE'

    local PLATFORM_SDK_VERSION='34'

    local PLATFORM_VERSION='14'



    local SDK_CODENAME="public static final int $PLATFORM_CODENAME_JAVA = CUR_DEVELOPMENT;"

    local SDK_VERSION="public static final int $PLATFORM_CODENAME_JAVA = $PLATFORM_SDK_VERSION;"



    local top="$(dirname "$0")"/../..
@@ -34,21 +39,42 @@ function finalize_aidl_vndk_sdk_resources() { 
        { cp $top/out/soong/vndk/vndk.libraries.txt $top/build/make/target/product/gsi/current.txt; }

    echo "DONE: THIS INTENTIONALLY MAY FAIL AND REPAIR ITSELF"



    # Finalize resources

    "$top/frameworks/base/tools/aapt2/tools/finalize_res.py" \

           "$top/frameworks/base/core/res/res/values/public-staging.xml" \

           "$top/frameworks/base/core/res/res/values/public-final.xml"

    # Finalize SDK



    # build/make

    local version_defaults="$top/build/make/core/version_defaults.mk"

    sed -i -e "s/PLATFORM_SDK_VERSION := .*/PLATFORM_SDK_VERSION := ${PLATFORM_SDK_VERSION}/g" $version_defaults

    sed -i -e "s/PLATFORM_VERSION_LAST_STABLE := .*/PLATFORM_VERSION_LAST_STABLE := ${PLATFORM_VERSION}/g" $version_defaults

    sed -i -e "s/sepolicy_major_vers := .*/sepolicy_major_vers := ${PLATFORM_SDK_VERSION}/g" "$top/build/make/core/config.mk"

    cp "$top/build/make/target/product/gsi/current.txt" "$top/build/make/target/product/gsi/$PLATFORM_SDK_VERSION.txt"



    # build/soong

    sed -i -e "/:.*$((${PLATFORM_SDK_VERSION}-1)),/a \\\t\t\t\"${PLATFORM_CODENAME}\":     ${PLATFORM_SDK_VERSION}," "$top/build/soong/android/api_levels.go"



    # SDK finalization

    local sdk_codename="public static final int $PLATFORM_CODENAME_JAVA = CUR_DEVELOPMENT;"

    local sdk_version="public static final int $PLATFORM_CODENAME_JAVA = $PLATFORM_SDK_VERSION;"

    local sdk_build="$top/frameworks/base/core/java/android/os/Build.java"

    # cts

    echo ${PLATFORM_VERSION} > "$top/cts/tests/tests/os/assets/platform_releases.txt"

    sed -i -e "s/EXPECTED_SDK = $((${PLATFORM_SDK_VERSION}-1))/EXPECTED_SDK = ${PLATFORM_SDK_VERSION}/g" "$top/cts/tests/tests/os/src/android/os/cts/BuildVersionTest.java"



    sed -i "s%$sdk_codename%$sdk_version%g" $sdk_build

    # libcore

    sed -i "s%$SDK_CODENAME%$SDK_VERSION%g" "$top/libcore/dalvik/src/main/java/dalvik/annotation/compat/VersionCodes.java"



    # platform_testing

    local version_codes="$top/platform_testing/libraries/compatibility-common-util/src/com/android/compatibility/common/util/VersionCodes.java"

    sed -i -e "/=.*$((${PLATFORM_SDK_VERSION}-1));/a \\    ${SDK_VERSION}" $version_codes



    # frameworks/base

    sed -i "s%$SDK_CODENAME%$SDK_VERSION%g" "$top/frameworks/base/core/java/android/os/Build.java"

    sed -i -e "/=.*$((${PLATFORM_SDK_VERSION}-1)),/a \\    SDK_${PLATFORM_CODENAME_JAVA} = ${PLATFORM_SDK_VERSION}," "$top/frameworks/base/tools/aapt/SdkConstants.h"

    sed -i -e "/=.*$((${PLATFORM_SDK_VERSION}-1)),/a \\  SDK_${PLATFORM_CODENAME_JAVA} = ${PLATFORM_SDK_VERSION}," "$top/frameworks/base/tools/aapt2/SdkConstants.h"



    # Force update current.txt

    $m clobber

    $m update-api



    # Finalize resources

    "$top/frameworks/base/tools/aapt2/tools/finalize_res.py" \

           "$top/frameworks/base/core/res/res/values/public-staging.xml" \

           "$top/frameworks/base/core/res/res/values/public-final.xml"

}



finalize_aidl_vndk_sdk_resources

finalize-sdk-rel.sh

+7 −0
Original line number Diff line number Diff line
@@ -9,6 +9,13 @@ function finalize_sdk_rel() { 
    local PLATFORM_VERSION='14'

    local PLATFORM_SDK_VERSION='34'



    # default target to modify tree and build SDK

    local m="$DEV_SRC_DIR/build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug"



    # adb keys

    $m adb

    LOGNAME=android-eng HOSTNAME=google.com adb keygen "$DEV_SRC_DIR/vendor/google/security/adb/${PLATFORM_VERSION}.adb_key"



    # build/make/core/version_defaults.mk

    sed -i -e "s/PLATFORM_VERSION_CODENAME.${BUILD_PREFIX} := .*/PLATFORM_VERSION_CODENAME.${BUILD_PREFIX} := REL/g" "$DEV_SRC_DIR/build/make/core/version_defaults.mk"