From 375ea3b4578c7d907e43e981f4b46ad81e5920a1 Mon Sep 17 00:00:00 2001 From: Alex Buynytskyy Date: Thu, 2 Mar 2023 21:16:48 +0000 Subject: [PATCH] Don't stop on bump sdk failures. This is a known issue, fix is in progress. Bug: 243966946 Test: run locally Change-Id: Iafcfacc61654838bf0f9ca2321461058ca9afa5b --- tools/finalization/finalize-aidl-vndk-sdk-resources.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/finalization/finalize-aidl-vndk-sdk-resources.sh b/tools/finalization/finalize-aidl-vndk-sdk-resources.sh index e23e585311..aace6738bc 100755 --- a/tools/finalization/finalize-aidl-vndk-sdk-resources.sh +++ b/tools/finalization/finalize-aidl-vndk-sdk-resources.sh @@ -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