Latest finalization scripts.
Bug: 243966946
Bug: 260755259
Test: run locally
Change-Id: I33a841bd83c20b31af604ea014cced38429da0f5
diff --git a/finalize-aidl-vndk-sdk-resources.sh b/finalize-aidl-vndk-sdk-resources.sh
index 8e12c49..8403ae6 100755
--- a/finalize-aidl-vndk-sdk-resources.sh
+++ b/finalize-aidl-vndk-sdk-resources.sh
@@ -3,6 +3,9 @@
set -ex
function finalize_aidl_vndk_sdk_resources() {
+ local PLATFORM_CODENAME_JAVA='UPSIDE_DOWN_CAKE'
+ local PLATFORM_SDK_VERSION='34'
+
local top="$(dirname "$0")"/../..
# default target to modify tree and build SDK
@@ -11,11 +14,13 @@
# This script is WIP and only finalizes part of the Android branch for release.
# The full process can be found at (INTERNAL) go/android-sdk-finalization.
- # VNDK snapshot (TODO)
- # SDK snapshots (TODO)
# Update references in the codebase to new API version (TODO)
# ...
+ # VNDK definitions for new SDK version
+ cp "$top/development/vndk/tools/definition-tool/datasets/vndk-lib-extra-list-current.txt" \
+ "$top/development/vndk/tools/definition-tool/datasets/vndk-lib-extra-list-$PLATFORM_SDK_VERSION.txt"
+
AIDL_TRANSITIVE_FREEZE=true $m aidl-freeze-api create_reference_dumps
# Generate ABI dumps
@@ -35,8 +40,8 @@
"$top/frameworks/base/core/res/res/values/public-final.xml"
# SDK finalization
- local sdk_codename='public static final int UPSIDE_DOWN_CAKE = CUR_DEVELOPMENT;'
- local sdk_version='public static final int UPSIDE_DOWN_CAKE = 34;'
+ local sdk_codename="public static final int $PLATFORM_CODENAME_JAVA = CUR_DEVELOPMENT;"
+ local sdk_version="public static final int $PLATFORM_CODENAME_JAVA = $PLATFORM_SDK_VERSION;"
local sdk_build="$top/frameworks/base/core/java/android/os/Build.java"
sed -i "s%$sdk_codename%$sdk_version%g" $sdk_build