commit 28e19ef89d1285665a6d7465f0567fe1d11c8c2e
author Hsin-Yi Chen <hsinyichen@google.com> Thu Apr 18 10:55:59 2024 +0800
committer Hsin-Yi Chen <hsinyichen@google.com> Fri Apr 19 03:12:55 2024 +0000
tree ba3e0d2a9c024dbd28984f58f37df0c583bba2c7
parent fb30407477fe9aadc440dc5779294b4443bb3e74

Do not copy platform ABI dumps from current

In trunk stable, the ABI dumps in "current" directory are not what we
intend to finalize. They need to be removed. The step will be replaced
with a command that builds ABI dumps.

Ignore-AOSP-First: merge conflict
Test: build/make/tools/finalization/finalize-sdk-rel.sh
Bug: 333532038
Change-Id: I08896b637b34861e73cff4d829941d9fb5c56475

tools/finalization/finalize-sdk-rel.sh

diff --git a/tools/finalization/finalize-sdk-rel.sh b/tools/finalization/finalize-sdk-rel.sh
index ca2f20d..11bc25c 100755
--- a/tools/finalization/finalize-sdk-rel.sh
+++ b/tools/finalization/finalize-sdk-rel.sh
@@ -33,15 +33,7 @@
     fi
     git -C "$top/cts" mv hostsidetests/theme/assets/${FINAL_PLATFORM_CODENAME} hostsidetests/theme/assets/${FINAL_PLATFORM_SDK_VERSION}
 
-    # prebuilts/abi-dumps/platform
-    mkdir -p "$top/prebuilts/abi-dumps/platform/$FINAL_PLATFORM_SDK_VERSION"
-    cp -r "$top/prebuilts/abi-dumps/platform/current/64/" "$top/prebuilts/abi-dumps/platform/$FINAL_PLATFORM_SDK_VERSION/"
-
-    # TODO(b/309880485)
-    # uncomment and update
-    # 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/"
+    # TODO(b/333532038): Create ABI dumps in prebuilts/abi-dumps/platform
 }
 
 finalize_sdk_rel