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

Commit e54084b5 authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Gerrit Code Review
Browse files

Merge "Don't stop on bump sdk failures."

parents 04d5903f 375ea3b4

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

+2 −0
Original line number Diff line number Diff line
@@ -133,7 +133,9 @@ function finalize_aidl_vndk_sdk_resources() { 
    sed -i -e "/=.*$((${FINAL_PLATFORM_SDK_VERSION}-1)),/a \\  SDK_${FINAL_PLATFORM_CODENAME_JAVA} = ${FINAL_PLATFORM_SDK_VERSION}," "$top/frameworks/base/tools/aapt2/SdkConstants.h"



    # Bump Mainline SDK extension version.

    set +e

    "$top/packages/modules/SdkExtensions/gen_sdk/bump_sdk.sh" ${FINAL_MAINLINE_EXTENSION}

    set -e

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

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