From 5dfdbe12bc8a9ac13361a6f6bb3e63e314444bda Mon Sep 17 00:00:00 2001 From: Alex Buynytskyy Date: Fri, 31 Mar 2023 22:20:29 +0000 Subject: [PATCH] Move adb keys creation to CI-only step. It's easily automatable build step, but it needs to be done way before REL to allow enough time for manual key propagation. As such, moving it to local step. Bug: 243966946 Test: manual Change-Id: I979e8500c3c0b768af30dff93c9b73ab998a0151 --- tools/finalization/finalize-sdk-rel.sh | 7 ------- tools/finalization/localonly-finalize-mainline-sdk.sh | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/finalization/finalize-sdk-rel.sh b/tools/finalization/finalize-sdk-rel.sh index 5cc90cf06c..9b5415be38 100755 --- a/tools/finalization/finalize-sdk-rel.sh +++ b/tools/finalization/finalize-sdk-rel.sh @@ -18,19 +18,12 @@ function finalize_sdk_rel() { local top="$(dirname "$0")"/../../../.. source $top/build/make/tools/finalization/environment.sh - # 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 DIST_DIR=out/dist" - # revert droidstubs hack now we are switching to REL revert_droidstubs_hack # let the apps built with pre-release SDK parse apply_prerelease_sdk_hack - # adb keys - $m adb - LOGNAME=android-eng HOSTNAME=google.com "$top/out/host/linux-x86/bin/adb" keygen "$top/vendor/google/security/adb/${FINAL_PLATFORM_VERSION}.adb_key" - # build/make/core/version_defaults.mk sed -i -e "s/PLATFORM_VERSION_CODENAME.${FINAL_BUILD_PREFIX} := .*/PLATFORM_VERSION_CODENAME.${FINAL_BUILD_PREFIX} := REL/g" "$top/build/make/core/version_defaults.mk" diff --git a/tools/finalization/localonly-finalize-mainline-sdk.sh b/tools/finalization/localonly-finalize-mainline-sdk.sh index f614fc11b9..2b77c5dbbd 100755 --- a/tools/finalization/localonly-finalize-mainline-sdk.sh +++ b/tools/finalization/localonly-finalize-mainline-sdk.sh @@ -6,6 +6,13 @@ function finalize_locally_mainline_sdk() { local top="$(dirname "$0")"/../../../.. source $top/build/make/tools/finalization/environment.sh + # 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 DIST_DIR=out/dist" + + # adb keys + $m adb + LOGNAME=android-eng HOSTNAME=google.com "$top/out/host/linux-x86/bin/adb" keygen "$top/vendor/google/security/adb/${FINAL_PLATFORM_VERSION}.adb_key" + # Build Platform SDKs. $top/build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=sdk TARGET_BUILD_VARIANT=userdebug sdk dist sdk_repo DIST_DIR=out/dist