Remove scripts no longer in use.
Refactored and moved under build/make/tools/finalization. Bug: 264308911 Fixes: 264308911 Test: local and on build machines Change-Id: Ib6ef58fd4e5cd1d7989d7d8fa7ef09532cbe84ec
This commit is contained in:
Alex Buynytskyy
parent
c28c48b439
commit
25ae24706c
9 changed files with 0 additions and 336 deletions
|
|
@ -1,81 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -ex
|
||||
|
||||
function finalize_aidl_vndk_sdk_resources() {
|
||||
local PLATFORM_CODENAME='UpsideDownCake'
|
||||
local PLATFORM_CODENAME_JAVA='UPSIDE_DOWN_CAKE'
|
||||
local PLATFORM_SDK_VERSION='34'
|
||||
local PLATFORM_VERSION='14'
|
||||
|
||||
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 top="$(dirname "$0")"/../..
|
||||
|
||||
# default target to modify tree and build SDK
|
||||
local m="$top/build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug"
|
||||
|
||||
# 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.
|
||||
|
||||
# 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
|
||||
ANDROID_BUILD_TOP="$top" \
|
||||
out/host/linux-x86/bin/create_reference_dumps \
|
||||
-p aosp_arm64 --build-variant user
|
||||
|
||||
echo "NOTE: THIS INTENTIONALLY MAY FAIL AND REPAIR ITSELF (until 'DONE')"
|
||||
# Update new versions of files. See update-vndk-list.sh (which requires envsetup.sh)
|
||||
$m check-vndk-list || \
|
||||
{ cp $top/out/soong/vndk/vndk.libraries.txt $top/build/make/target/product/gsi/current.txt; }
|
||||
echo "DONE: THIS INTENTIONALLY MAY FAIL AND REPAIR ITSELF"
|
||||
|
||||
# Finalize SDK
|
||||
|
||||
# build/make
|
||||
local version_defaults="$top/build/make/core/version_defaults.mk"
|
||||
sed -i -e "s/PLATFORM_SDK_VERSION := .*/PLATFORM_SDK_VERSION := ${PLATFORM_SDK_VERSION}/g" $version_defaults
|
||||
sed -i -e "s/PLATFORM_VERSION_LAST_STABLE := .*/PLATFORM_VERSION_LAST_STABLE := ${PLATFORM_VERSION}/g" $version_defaults
|
||||
sed -i -e "s/sepolicy_major_vers := .*/sepolicy_major_vers := ${PLATFORM_SDK_VERSION}/g" "$top/build/make/core/config.mk"
|
||||
cp "$top/build/make/target/product/gsi/current.txt" "$top/build/make/target/product/gsi/$PLATFORM_SDK_VERSION.txt"
|
||||
|
||||
# build/soong
|
||||
sed -i -e "/:.*$((${PLATFORM_SDK_VERSION}-1)),/a \\\t\t\t\"${PLATFORM_CODENAME}\": ${PLATFORM_SDK_VERSION}," "$top/build/soong/android/api_levels.go"
|
||||
|
||||
# cts
|
||||
echo ${PLATFORM_VERSION} > "$top/cts/tests/tests/os/assets/platform_releases.txt"
|
||||
sed -i -e "s/EXPECTED_SDK = $((${PLATFORM_SDK_VERSION}-1))/EXPECTED_SDK = ${PLATFORM_SDK_VERSION}/g" "$top/cts/tests/tests/os/src/android/os/cts/BuildVersionTest.java"
|
||||
|
||||
# libcore
|
||||
sed -i "s%$SDK_CODENAME%$SDK_VERSION%g" "$top/libcore/dalvik/src/main/java/dalvik/annotation/compat/VersionCodes.java"
|
||||
|
||||
# platform_testing
|
||||
local version_codes="$top/platform_testing/libraries/compatibility-common-util/src/com/android/compatibility/common/util/VersionCodes.java"
|
||||
sed -i -e "/=.*$((${PLATFORM_SDK_VERSION}-1));/a \\ ${SDK_VERSION}" $version_codes
|
||||
|
||||
# Finalize resources
|
||||
"$top/frameworks/base/tools/aapt2/tools/finalize_res.py" \
|
||||
"$top/frameworks/base/core/res/res/values/public-staging.xml" \
|
||||
"$top/frameworks/base/core/res/res/values/public-final.xml"
|
||||
|
||||
# frameworks/base
|
||||
sed -i "s%$SDK_CODENAME%$SDK_VERSION%g" "$top/frameworks/base/core/java/android/os/Build.java"
|
||||
sed -i -e "/=.*$((${PLATFORM_SDK_VERSION}-1)),/a \\ SDK_${PLATFORM_CODENAME_JAVA} = ${PLATFORM_SDK_VERSION}," "$top/frameworks/base/tools/aapt/SdkConstants.h"
|
||||
sed -i -e "/=.*$((${PLATFORM_SDK_VERSION}-1)),/a \\ SDK_${PLATFORM_CODENAME_JAVA} = ${PLATFORM_SDK_VERSION}," "$top/frameworks/base/tools/aapt2/SdkConstants.h"
|
||||
|
||||
# Force update current.txt
|
||||
$m clobber
|
||||
$m update-api
|
||||
}
|
||||
|
||||
finalize_aidl_vndk_sdk_resources
|
||||
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
#!/bin/bash
|
||||
# Brings local repository to a remote head state.
|
||||
|
||||
# set -ex
|
||||
|
||||
function finalize_revert_local_changes_main() {
|
||||
local top="$(dirname "$0")"/../..
|
||||
|
||||
repo selfupdate
|
||||
|
||||
repo forall -c '\
|
||||
git checkout . ; git revert --abort ; git clean -fdx ;\
|
||||
git checkout @ ; git branch fina-step1 -D ; git reset --hard; \
|
||||
repo start fina-step1 ; git checkout @ ; git b fina-step1 -D ;'
|
||||
}
|
||||
|
||||
finalize_revert_local_changes_main
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -ex
|
||||
|
||||
function finalize_locally_mainline_sdk() {
|
||||
local MAINLINE_EXTENSION='6'
|
||||
|
||||
local top="$(dirname "$0")"/../..
|
||||
|
||||
# Bump SDK extension version.
|
||||
"$top/packages/modules/SdkExtensions/gen_sdk/bump_sdk.sh" ${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
|
||||
|
||||
# Build modules SDKs.
|
||||
TARGET_BUILD_VARIANT=userdebug UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true "$top/vendor/google/build/mainline_modules_sdks.sh"
|
||||
|
||||
# Update prebuilts.
|
||||
"$top/prebuilts/build-tools/path/linux-x86/python3" "$top/packages/modules/common/tools/finalize_sdk.py" -l -b 0 -f ${MAINLINE_EXTENSION} -r '' 0
|
||||
}
|
||||
|
||||
finalize_locally_mainline_sdk
|
||||
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -ex
|
||||
|
||||
function finalize_sdk_rel() {
|
||||
local DEV_SRC_DIR="$(dirname "$0")"/../..
|
||||
local BUILD_PREFIX='UP1A'
|
||||
local PLATFORM_CODENAME='UpsideDownCake'
|
||||
local PLATFORM_VERSION='14'
|
||||
local PLATFORM_SDK_VERSION='34'
|
||||
|
||||
# default target to modify tree and build SDK
|
||||
local m="$DEV_SRC_DIR/build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug"
|
||||
|
||||
# adb keys
|
||||
$m adb
|
||||
LOGNAME=android-eng HOSTNAME=google.com "$DEV_SRC_DIR/out/host/linux-x86/bin/adb" keygen "$DEV_SRC_DIR/vendor/google/security/adb/${PLATFORM_VERSION}.adb_key"
|
||||
|
||||
# build/make/core/version_defaults.mk
|
||||
sed -i -e "s/PLATFORM_VERSION_CODENAME.${BUILD_PREFIX} := .*/PLATFORM_VERSION_CODENAME.${BUILD_PREFIX} := REL/g" "$DEV_SRC_DIR/build/make/core/version_defaults.mk"
|
||||
|
||||
# cts
|
||||
echo "$PLATFORM_VERSION" > "$DEV_SRC_DIR/cts/tests/tests/os/assets/platform_versions.txt"
|
||||
git -C "$DEV_SRC_DIR/cts" mv hostsidetests/theme/assets/${PLATFORM_CODENAME} hostsidetests/theme/assets/${PLATFORM_SDK_VERSION}
|
||||
|
||||
# system/sepolicy
|
||||
mkdir -p "$DEV_SRC_DIR/system/sepolicy/prebuilts/api/${PLATFORM_SDK_VERSION}.0/"
|
||||
cp -r "$DEV_SRC_DIR/system/sepolicy/public/" "$DEV_SRC_DIR/system/sepolicy/prebuilts/api/${PLATFORM_SDK_VERSION}.0/"
|
||||
cp -r "$DEV_SRC_DIR/system/sepolicy/private/" "$DEV_SRC_DIR/system/sepolicy/prebuilts/api/${PLATFORM_SDK_VERSION}.0/"
|
||||
|
||||
# prebuilts/abi-dumps/ndk
|
||||
mv "$DEV_SRC_DIR/prebuilts/abi-dumps/ndk/current" "$DEV_SRC_DIR/prebuilts/abi-dumps/ndk/$PLATFORM_SDK_VERSION"
|
||||
|
||||
# prebuilts/abi-dumps/vndk
|
||||
mv "$DEV_SRC_DIR/prebuilts/abi-dumps/vndk/$PLATFORM_CODENAME" "$DEV_SRC_DIR/prebuilts/abi-dumps/vndk/$PLATFORM_SDK_VERSION"
|
||||
|
||||
# prebuilts/abi-dumps/platform
|
||||
mv "$DEV_SRC_DIR/prebuilts/abi-dumps/platform/current" "$DEV_SRC_DIR/prebuilts/abi-dumps/platform/$PLATFORM_SDK_VERSION"
|
||||
}
|
||||
|
||||
finalize_sdk_rel
|
||||
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
#!/bin/bash
|
||||
# Continuous Integration script for *-finalization-1 branches.
|
||||
# Reverts previous finalization script commits and runs local build.
|
||||
|
||||
set -ex
|
||||
|
||||
function finalize_step_1_main() {
|
||||
local top="$(dirname "$0")"/../..
|
||||
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/finalize-aidl-vndk-sdk-resources.sh
|
||||
|
||||
# build to confirm everything is OK
|
||||
AIDL_FROZEN_REL=true $m
|
||||
}
|
||||
|
||||
finalize_step_1_main
|
||||
|
|
@ -1,51 +0,0 @@
|
|||
#!/bin/bash
|
||||
# Automation for finalize_branch_for_release.sh.
|
||||
# Sets up local environment, runs the finalization script and submits the results.
|
||||
# WIP:
|
||||
# - does not submit, only sends to gerrit.
|
||||
|
||||
# set -ex
|
||||
|
||||
function revert_to_unfinalized_state() {
|
||||
repo forall -c '\
|
||||
git checkout . ; git revert --abort ; git clean -fdx ;\
|
||||
git checkout @ ; git branch fina-step1 -D ; git reset --hard; \
|
||||
repo start fina-step1 ; git checkout @ ; git b fina-step1 -D ;\
|
||||
baselineHash="$(git log --format=%H --no-merges --max-count=1 --grep ^FINALIZATION_STEP_1_BASELINE_COMMIT)" ;\
|
||||
if [[ $baselineHash ]]; then
|
||||
previousHash="$(git log --format=%H --no-merges --max-count=100 --grep ^FINALIZATION_STEP_1_SCRIPT_COMMIT $baselineHash..HEAD | tr \n \040)" ;\
|
||||
else
|
||||
previousHash="$(git log --format=%H --no-merges --max-count=100 --grep ^FINALIZATION_STEP_1_SCRIPT_COMMIT | tr \n \040)" ;\
|
||||
fi ; \
|
||||
if [[ $previousHash ]]; then git revert --no-commit --strategy=ort --strategy-option=ours $previousHash ; fi ;'
|
||||
}
|
||||
|
||||
function commit_changes() {
|
||||
repo forall -c '\
|
||||
if [[ $(git status --short) ]]; then
|
||||
repo start fina-step1 ;
|
||||
git add -A . ;
|
||||
git commit -m FINALIZATION_STEP_1_SCRIPT_COMMIT -m WILL_BE_AUTOMATICALLY_REVERTED ;
|
||||
repo upload --cbr --no-verify -o nokeycheck -t -y . ;
|
||||
git clean -fdx ; git reset --hard ;
|
||||
fi'
|
||||
}
|
||||
|
||||
function finalize_step_1_main() {
|
||||
# deprecated, do not use
|
||||
exit 1
|
||||
|
||||
local top="$(dirname "$0")"/../..
|
||||
|
||||
repo selfupdate
|
||||
|
||||
revert_to_unfinalized_state
|
||||
|
||||
# vndk etc finalization
|
||||
source $top/build/make/finalize-aidl-vndk-sdk-resources.sh
|
||||
|
||||
# move all changes to fina-step1 branch and commit with a robot message
|
||||
commit_changes
|
||||
}
|
||||
|
||||
finalize_step_1_main
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
#!/bin/bash
|
||||
# Continuous Integration script for *-finalization-2 branches.
|
||||
# Reverts previous finalization script commits and runs local build.
|
||||
|
||||
set -ex
|
||||
|
||||
function finalize_step_2_main() {
|
||||
local top="$(dirname "$0")"/../..
|
||||
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/finalize-aidl-vndk-sdk-resources.sh
|
||||
|
||||
# prebuilts etc
|
||||
source $top/build/make/finalize-sdk-rel.sh
|
||||
|
||||
# mainline sdk prebuilts
|
||||
source $top/build/make/finalize-locally-mainline-sdk.sh
|
||||
|
||||
# build to confirm everything is OK
|
||||
AIDL_FROZEN_REL=true $m
|
||||
}
|
||||
|
||||
finalize_step_2_main
|
||||
|
|
@ -1,51 +0,0 @@
|
|||
#!/bin/bash
|
||||
# Automation for finalize_branch_for_release.sh.
|
||||
# Sets up local environment, runs the finalization script and submits the results.
|
||||
# WIP:
|
||||
# - does not submit, only sends to gerrit.
|
||||
|
||||
# set -ex
|
||||
|
||||
function revert_to_unfinalized_state() {
|
||||
repo forall -c '\
|
||||
git checkout . ; git revert --abort ; git clean -fdx ;\
|
||||
git checkout @ ; git branch fina-step2 -D ; git reset --hard; \
|
||||
repo start fina-step2 ; git checkout @ ; git b fina-step2 -D ;\
|
||||
baselineHash="$(git log --format=%H --no-merges --max-count=1 --grep ^FINALIZATION_STEP_2_BASELINE_COMMIT)" ;\
|
||||
if [[ $baselineHash ]]; then
|
||||
previousHash="$(git log --format=%H --no-merges --max-count=100 --grep ^FINALIZATION_STEP_2_SCRIPT_COMMIT $baselineHash..HEAD | tr \n \040)" ;\
|
||||
else
|
||||
previousHash="$(git log --format=%H --no-merges --max-count=100 --grep ^FINALIZATION_STEP_2_SCRIPT_COMMIT | tr \n \040)" ;\
|
||||
fi ; \
|
||||
if [[ $previousHash ]]; then git revert --no-commit --strategy=ort --strategy-option=ours $previousHash ; fi ;'
|
||||
}
|
||||
|
||||
function commit_changes() {
|
||||
repo forall -c '\
|
||||
if [[ $(git status --short) ]]; then
|
||||
repo start fina-step1 ;
|
||||
git add -A . ;
|
||||
git commit -m FINALIZATION_STEP_2_SCRIPT_COMMIT -m WILL_BE_AUTOMATICALLY_REVERTED ;
|
||||
repo upload --cbr --no-verify -o nokeycheck -t -y . ;
|
||||
git clean -fdx ; git reset --hard ;
|
||||
fi'
|
||||
}
|
||||
|
||||
function finalize_step_2_main() {
|
||||
# deprecated, do not use
|
||||
exit 1
|
||||
|
||||
local top="$(dirname "$0")"/../..
|
||||
|
||||
repo selfupdate
|
||||
|
||||
revert_to_unfinalized_state
|
||||
|
||||
# vndk etc finalization
|
||||
source $top/build/make/finalize-aidl-vndk-sdk-resources.sh
|
||||
|
||||
# move all changes to fina-step1 branch and commit with a robot message
|
||||
commit_changes
|
||||
}
|
||||
|
||||
finalize_step_2_main
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -ex
|
||||
|
||||
function finalize_main() {
|
||||
local top="$(dirname "$0")"/../..
|
||||
|
||||
# default target to modify tree and build SDK
|
||||
local m="$top/build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug"
|
||||
|
||||
# Build finalization artifacts.
|
||||
source $top/build/make/finalize-aidl-vndk-sdk-resources.sh
|
||||
|
||||
# This command tests:
|
||||
# The release state for AIDL.
|
||||
# ABI difference between user and userdebug builds.
|
||||
# Resource/SDK finalization.
|
||||
# In the future, we would want to actually turn the branch into the REL
|
||||
# state and test with that.
|
||||
AIDL_FROZEN_REL=true $m
|
||||
|
||||
# Build SDK (TODO)
|
||||
# lunch sdk...
|
||||
# m ...
|
||||
}
|
||||
|
||||
finalize_main
|
||||
|
||||
Loading…
Reference in a new issue