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

Commit 91c2117f authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "Merge Android 12 QPR 3"

parents 59f36c19 b9463f81

envsetup.sh

+11 −1
Original line number Diff line number Diff line
@@ -817,7 +817,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
@@ -836,6 +838,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
@@ -843,6 +849,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.