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

Merge Android 12 QPR3 ab/8391262

Browse source 
Bug: 226662282
Merged-In: Ib35026f71208afa53f33ee9967cd9acb88a73d0d
Change-Id: If4821c4f2d7e8a0c1cae728a7719be33277a1b2e
This commit is contained in:
Xin Li 2022-04-01 20:31:48 +00:00
commit f36e10b1f9
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/version_defaults.mk
View file

@ -98,7 +98,7 @@ ifndef PLATFORM_SECURITY_PATCH
# It must be of the form "YYYY-MM-DD" on production devices. # It must be of the form "YYYY-MM-DD" on production devices.
# It must match one of the Android Security Patch Level strings of the Public Security Bulletins. # It must match one of the Android Security Patch Level strings of the Public Security Bulletins.
# If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
PLATFORM_SECURITY_PATCH := 2022-03-05 PLATFORM_SECURITY_PATCH := 2022-05-05
endif endif
.KATI_READONLY := PLATFORM_SECURITY_PATCH .KATI_READONLY := PLATFORM_SECURITY_PATCH

12
envsetup.sh
View file

@ -758,7 +758,9 @@ function tapas()
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)"
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 apps="$(echo $* | xargs -n 1 echo | \grep -E -v '^(user|userdebug|eng|arm|x86|arm64|x86_64|ldpi|mdpi|tvdpi|hdpi|xhdpi|xxhdpi|xxxhdpi|alldpi)$' | xargs)" local keys="$(echo $* | xargs -n 1 echo | \grep -E '^(devkeys)$' | xargs)"
local apps="$(echo $* | xargs -n 1 echo | \grep -E -v '^(user|userdebug|eng|arm|x86|arm64|x86_64|ldpi|mdpi|tvdpi|hdpi|xhdpi|xxhdpi|xxxhdpi|alldpi|devkeys)$' | xargs)"
if [ "$showHelp" != "" ]; then if [ "$showHelp" != "" ]; then
$(gettop)/build/make/tapasHelp.sh $(gettop)/build/make/tapasHelp.sh
@ -777,6 +779,10 @@ function tapas()
echo "tapas: Error: Multiple densities supplied: $density" echo "tapas: Error: Multiple densities supplied: $density"
return return
fi fi
if [ $(echo $keys | wc -w) -gt 1 ]; then
echo "tapas: Error: Multiple keys supplied: $keys"
return
fi
local product=aosp_arm local product=aosp_arm
case $arch in case $arch in
@ -784,6 +790,10 @@ function tapas()
arm64) product=aosp_arm64;; arm64) product=aosp_arm64;;
x86_64) product=aosp_x86_64;; x86_64) product=aosp_x86_64;;
esac esac
if [ -n "$keys" ]; then
product=${product/aosp_/aosp_${keys}_}
fi;
if [ -z "$variant" ]; then if [ -z "$variant" ]; then
variant=eng variant=eng
fi fi

2
tapasHelp.sh
View file

@ -6,7 +6,7 @@ SCRIPT_DIR="${PWD}"
cd ../.. cd ../..
TOP="${PWD}" TOP="${PWD}"
message='usage: tapas [<App1> <App2> ...] [arm|x86|arm64|x86_64] [eng|userdebug|user] message='usage: tapas [<App1> <App2> ...] [arm|x86|arm64|x86_64] [eng|userdebug|user] [devkeys]
tapas selects individual apps to be built by the Android build system. Unlike tapas selects individual apps to be built by the Android build system. Unlike
"lunch", "tapas" does not request the building of images for a device. "lunch", "tapas" does not request the building of images for a device.