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

Commit 2a19321e authored by Steven Moreland's avatar Steven Moreland Committed by Android (Google) Code Review
Browse files

Merge "finalization: remove VNDK stuff" into main

parents 41f3130e af6c94a9

tools/finalization/finalize-sdk-rel.sh

+0 −4
Original line number Diff line number Diff line
@@ -52,10 +52,6 @@ function finalize_sdk_rel() { 
    # prebuilts/abi-dumps/ndk

    #mkdir -p "$top/prebuilts/abi-dumps/ndk/$FINAL_PLATFORM_SDK_VERSION"

    #cp -r "$top/prebuilts/abi-dumps/ndk/current/64/" "$top/prebuilts/abi-dumps/ndk/$FINAL_PLATFORM_SDK_VERSION/"

    #if [ "$FINAL_STATE" != "sdk" ] || [ "$FINAL_PLATFORM_CODENAME" == "$CURRENT_PLATFORM_CODENAME" ] ; then

        # prebuilts/abi-dumps/vndk

        #mv "$top/prebuilts/abi-dumps/vndk/$CURRENT_PLATFORM_CODENAME" "$top/prebuilts/abi-dumps/vndk/$FINAL_PLATFORM_SDK_VERSION"

    #fi;

}



finalize_sdk_rel

tools/finalization/finalize-sdk-resources.sh

+2 −5
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ function bumpSdkExtensionsVersion() { 
        $modules_arg

}



function finalize_aidl_vndk_sdk_resources() {

function finalize_sdk_resources() {

    local top="$(dirname "$0")"/../../../..

    source $top/build/make/tools/finalization/environment.sh
@@ -111,9 +111,6 @@ function finalize_aidl_vndk_sdk_resources() { 
    # bionic/NDK

    finalize_bionic_ndk



    # TODO(b/309880485)

    # Add back create_reference_dumps and $top/build/make/target/product/gsi/current.txt



    # Finalize SDK



    # frameworks/libs/modules-utils
@@ -171,5 +168,5 @@ function finalize_aidl_vndk_sdk_resources() { 
    $sdk_m update-api

}



finalize_aidl_vndk_sdk_resources

finalize_sdk_resources