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

Commit 9b810df3 authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Automerger Merge Worker
Browse files

Merge "Don't stop on bump sdk failures." am: e54084b5 

Original change: https://android-review.googlesource.com/c/platform/build/+/2467468



Change-Id: Iea127e77d1b44d8acfdf117239b628778f76fa34
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e26da42c e54084b5

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