diff options
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | core/version_defaults.mk | 2 | ||||
| -rw-r--r-- | envsetup.sh | 12 | ||||
| -rwxr-xr-x | tapasHelp.sh | 2 |
4 files changed, 14 insertions, 4 deletions
diff --git a/core/build_id.mk b/core/build_id.mk index 7e2def006b..497d606cff 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID=SPM2.220419.001 +BUILD_ID=SPM2.220517.001 diff --git a/core/version_defaults.mk b/core/version_defaults.mk index a0897449cf..0daae6bdcb 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -240,7 +240,7 @@ ifndef PLATFORM_SECURITY_PATCH # 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. # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2022-05-05 + PLATFORM_SECURITY_PATCH := 2022-06-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH diff --git a/envsetup.sh b/envsetup.sh index 8a995c7fdc..a8b224d55e 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -746,7 +746,9 @@ function tapas() 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 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 $(gettop)/build/make/tapasHelp.sh @@ -765,6 +767,10 @@ function tapas() echo "tapas: Error: Multiple densities supplied: $density" return fi + if [ $(echo $keys | wc -w) -gt 1 ]; then + echo "tapas: Error: Multiple keys supplied: $keys" + return + fi local product=aosp_arm case $arch in @@ -772,6 +778,10 @@ function tapas() arm64) product=aosp_arm64;; x86_64) product=aosp_x86_64;; esac + if [ -n "$keys" ]; then + product=${product/aosp_/aosp_${keys}_} + fi; + if [ -z "$variant" ]; then variant=eng fi diff --git a/tapasHelp.sh b/tapasHelp.sh index 0f461304a3..7cb5f2c0fd 100755 --- a/tapasHelp.sh +++ b/tapasHelp.sh @@ -6,7 +6,7 @@ SCRIPT_DIR="${PWD}" cd ../.. 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 "lunch", "tapas" does not request the building of images for a device. |