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

Commit 4dd821f3 authored by Presubmit Automerger Backend's avatar Presubmit Automerger Backend
Browse files

[automerge] Add a keys argument to tapas 2p: 5ff4380b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16804130

Bug: 216553104
Change-Id: Ibc4ef4f682bbdb50c3aef23ee9cf4e68c247f7de
Merged-In: I2161be9e15f99713e11d22901d6eb7ad3c420093
parents 7aa3cc6c 5ff4380b

envsetup.sh

+11 −1
Original line number Original line Diff line number Diff line
@@ -749,7 +749,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
@@ -768,6 +770,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
@@ -775,6 +781,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

tapasHelp.sh

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