Merge tag 'android-12.1.0_r8' of https://android.googlesource.com/pla…

…tform/build into sc-v2

Android 12.1.0 Release 8 (SQ3A.220605.009.B1)

* tag 'android-12.1.0_r8' of https://android.googlesource.com/platform/build:
  Version bump to SQ3A.220605.009.B1 [core/build_id.mk]
  Version bump to SQ3A.220605.009 [core/build_id.mk]
  Version bump to SQ3A.220605.008 [core/build_id.mk]
  Version bump to SQ3A.220605.007 [core/build_id.mk]
  Version bump to SQ3A.220605.006 [core/build_id.mk]
  Version bump to SQ3A.220605.005 [core/build_id.mk]
  Version bump to SQ3A.220605.004 [core/build_id.mk]
  Version bump to SQ3A.220605.003 [core/build_id.mk]
  Version bump to SQ3A.220605.002 [core/build_id.mk]
  Update Security String to 2022-06-05
  Version bump to SQ3A.220401.002 [core/build_id.mk]
  Version bump to SQ3A.220316.002 [core/build_id.mk]
  Update Security String to 2022-05-05
  Update Security String to 2022-05-01
  Version bump to SQ3A.220308.002 [core/build_id.mk]
  Update Security String to 2022-04-05
  Add a keys argument to tapas
  Update Security String to 2022-04-01
  Update security string to 2022-03-01

Change-Id: Idc3b5394ebcbfc2a0f2959d003c0f9b6cd4787fe

core/build_id.mk

@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=SP2A.220505.002
+BUILD_ID=SQ3A.220605.009.B1

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
 

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,13 +767,21 @@ 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
       x86)    product=aosp_x86;;
       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

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.