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

Merge "Move adb keys creation to CI-only step." am: 90206e3493 am: 32e87bddce

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2518355

Change-Id: I8cedaec529422aa8a6f861d817323192f4373fa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-04-01 04:13:44 +00:00
committed by Automerger Merge Worker
parent 101d0c4a79 32e87bddce
commit c8fb22c156
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,19 +18,12 @@ function finalize_sdk_rel() {
local top="$(dirname "$0")"/../../../.. local top="$(dirname "$0")"/../../../..
source $top/build/make/tools/finalization/environment.sh 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 now we are switching to REL
revert_droidstubs_hack revert_droidstubs_hack
# let the apps built with pre-release SDK parse # let the apps built with pre-release SDK parse
apply_prerelease_sdk_hack 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 # 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" 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"

7
tools/finalization/localonly-finalize-mainline-sdk.sh
View File

@@ -6,6 +6,13 @@ function finalize_locally_mainline_sdk() {
local top="$(dirname "$0")"/../../../.. local top="$(dirname "$0")"/../../../..
source $top/build/make/tools/finalization/environment.sh 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. # 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 $top/build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=sdk TARGET_BUILD_VARIANT=userdebug sdk dist sdk_repo DIST_DIR=out/dist