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

Commit 236defba authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Finalization scripts bugfixes." am: 2857d266 am: b2f52e64 

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



Change-Id: Ib3cfcd7ffa2b502a9df0d2fceeff0ed39e46c25a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4b9bb421 b2f52e64

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

+2 −2
Original line number Diff line number Diff line
@@ -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

tools/finalization/step-2.sh

+0 −3
Original line number Diff line number Diff line
@@ -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