tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix tapas for git_main builds

Browse source 
In the git_main trunk stable builds, we're required to have a
TARGET_RELEASE set.

For now, we hard-code this to "trunk_staging" (and leave a TODO
to accept this as a function argument).

This will have us producing valid builds under git_main.

Bug: 307975293
Test: 'tapas google-tradefed-all' now works on a tree that has go/aog/2806253
Change-Id: I70572fb4c7902350513e251694f3ddef91efcb13
This commit is contained in:
Greg Kaiser 2023-10-26 18:37:40 +00:00
parent 6866204083
commit 83ed159cf7
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
envsetup.sh
View file

@ -887,6 +887,8 @@ function tapas()
{ {
local showHelp="$(echo $* | xargs -n 1 echo | \grep -E '^(help)$' | xargs)" local showHelp="$(echo $* | xargs -n 1 echo | \grep -E '^(help)$' | xargs)"
local arch="$(echo $* | xargs -n 1 echo | \grep -E '^(arm|x86|arm64|x86_64)$' | xargs)" local arch="$(echo $* | xargs -n 1 echo | \grep -E '^(arm|x86|arm64|x86_64)$' | xargs)"
# TODO(b/307975293): Expand tapas to take release arguments (and update hmm() usage).
local release="trunk_staging"
local variant="$(echo $* | xargs -n 1 echo | \grep -E '^(user|userdebug|eng)$' | xargs)" local variant="$(echo $* | xargs -n 1 echo | \grep -E '^(user|userdebug|eng)$' | xargs)"
local density="$(echo $* | xargs -n 1 echo | \grep -E '^(ldpi|mdpi|tvdpi|hdpi|xhdpi|xxhdpi|xxxhdpi|alldpi)$' | xargs)" local density="$(echo $* | xargs -n 1 echo | \grep -E '^(ldpi|mdpi|tvdpi|hdpi|xhdpi|xxhdpi|xxxhdpi|alldpi)$' | xargs)"
local keys="$(echo $* | xargs -n 1 echo | \grep -E '^(devkeys)$' | xargs)" local keys="$(echo $* | xargs -n 1 echo | \grep -E '^(devkeys)$' | xargs)"
@ -902,6 +904,10 @@ function tapas()
echo "tapas: Error: Multiple build archs supplied: $arch" echo "tapas: Error: Multiple build archs supplied: $arch"
return return
fi fi
if [ $(echo $release | wc -w) -gt 1 ]; then
echo "tapas: Error: Multiple build releases supplied: $release"
return
fi
if [ $(echo $variant | wc -w) -gt 1 ]; then if [ $(echo $variant | wc -w) -gt 1 ]; then
echo "tapas: Error: Multiple build variants supplied: $variant" echo "tapas: Error: Multiple build variants supplied: $variant"
return return
@ -936,6 +942,7 @@ function tapas()
fi fi
export TARGET_PRODUCT=$product export TARGET_PRODUCT=$product
export TARGET_RELEASE=$release
export TARGET_BUILD_VARIANT=$variant export TARGET_BUILD_VARIANT=$variant
export TARGET_BUILD_DENSITY=$density export TARGET_BUILD_DENSITY=$density
export TARGET_BUILD_TYPE=release export TARGET_BUILD_TYPE=release