Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f36e10b1 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 12 QPR3 ab/8391262 

Bug: 226662282
Merged-In: Ib35026f71208afa53f33ee9967cd9acb88a73d0d
Change-Id: If4821c4f2d7e8a0c1cae728a7719be33277a1b2e
parents 766d8ec7 c28d4311

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,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-03-05

    PLATFORM_SECURITY_PATCH := 2022-05-05

endif

.KATI_READONLY := PLATFORM_SECURITY_PATCH

envsetup.sh

+11 −1
Original line number Diff line number Diff line
@@ -758,7 +758,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
@@ -777,6 +779,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
@@ -784,6 +790,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

tapasHelp.sh

+1 −1
Original line number Diff line number Diff line
@@ -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.