tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Finalization scripts bugfixes.

Browse source 
Bug: 264308911
Test: local runs
Change-Id: Ie0812593fc41e1bb5d03e7912c3d526647f32725
This commit is contained in:
Alex Buynytskyy 2023-02-12 02:01:41 +00:00
parent fa7113c696
commit 1d2833ad2d
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/finalization/finalize-aidl-vndk-sdk-resources.sh
View file

@ -69,9 +69,9 @@ function finalize_aidl_vndk_sdk_resources() {
sed -i -e "/=.*$((${FINA_PLATFORM_SDK_VERSION}-1)),/a \\ SDK_${FINA_PLATFORM_CODENAME_JAVA} = ${FINA_PLATFORM_SDK_VERSION}," "$top/frameworks/base/tools/aapt2/SdkConstants.h"
# Bump Mainline SDK extension version.
"$top/packages/modules/SdkExtensions/gen_sdk/bump_sdk.sh" ${MAINLINE_EXTENSION}
"$top/packages/modules/SdkExtensions/gen_sdk/bump_sdk.sh" ${FINA_MAINLINE_EXTENSION}
local version_defaults="$top/build/make/core/version_defaults.mk"
sed -i -e "s/PLATFORM_SDK_EXTENSION_VERSION := .*/PLATFORM_SDK_EXTENSION_VERSION := ${MAINLINE_EXTENSION}/g" $version_defaults
sed -i -e "s/PLATFORM_SDK_EXTENSION_VERSION := .*/PLATFORM_SDK_EXTENSION_VERSION := ${FINA_MAINLINE_EXTENSION}/g" $version_defaults
# Force update current.txt
$m clobber

3
tools/finalization/step-2.sh
View file

@ -22,9 +22,6 @@ function finalize_step_2_main() {
local m="$top/build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug"
# vndk etc finalization
source $top/build/make/tools/finalization/finalize-aidl-vndk-sdk-resources.sh
# prebuilts etc
source $top/build/make/tools/finalization/finalize-sdk-rel.sh