StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "finalization: remove VNDK stuff" into main

Browse Source
This commit is contained in:
Steven Moreland
2024-01-29 21:01:47 +00:00
committed by Android (Google) Code Review
parent 41f3130e4e af6c94a9a6
commit 2a19321e3d
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/finalization/finalize-sdk-rel.sh
View File

@@ -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

7
tools/finalization/finalize-sdk-resources.sh
View File

@@ -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