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

Commit 68f74898 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix tapas for git_main builds" into main am: 3006f169 

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



Change-Id: Ia83f79665b8fdedf21de356ee21825d0e3f63bbb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e1d6a532 3006f169

envsetup.sh

+7 −0
Original line number Diff line number Diff line
@@ -887,6 +887,8 @@ function tapas() 
{

    local showHelp="$(echo $* | xargs -n 1 echo | \grep -E '^(help)$' | xargs)"

    local arch="$(echo $* | xargs -n 1 echo | \grep -E '^(arm|x86|arm64|x86_64)$' | xargs)"

    # TODO(b/307975293): Expand tapas to take release arguments (and update hmm() usage).

    local release="trunk_staging"

    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 keys="$(echo $* | xargs -n 1 echo | \grep -E '^(devkeys)$' | xargs)"
@@ -902,6 +904,10 @@ function tapas() 
        echo "tapas: Error: Multiple build archs supplied: $arch"

        return

    fi

    if [ $(echo $release | wc -w) -gt 1 ]; then

        echo "tapas: Error: Multiple build releases supplied: $release"

        return

    fi

    if [ $(echo $variant | wc -w) -gt 1 ]; then

        echo "tapas: Error: Multiple build variants supplied: $variant"

        return
@@ -936,6 +942,7 @@ function tapas() 
    fi



    export TARGET_PRODUCT=$product

    export TARGET_RELEASE=$release

    export TARGET_BUILD_VARIANT=$variant

    export TARGET_BUILD_DENSITY=$density

    export TARGET_BUILD_TYPE=release