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

Commit a02c7474 authored by Jeff Hamilton's avatar Jeff Hamilton
Browse files

Add lunch support for TARGET_RELEASE 

This replaces support for the unused
TARGET_PLATFORM_VERSION variable.

Now, if you pass three - separated
items the first is product, the
second is release and the third
is variant. If you only pass two
they're still product-variant
and the build system will choose
a reasonable default for release.

Test: run lunch with two and three items, confirmed values in the build banner
Change-Id: I128177d96ffe81b79b6945a24ebf37861c3b25fc
parent d00675c7

envsetup.sh

+16 −10
Original line number Diff line number Diff line
@@ -804,13 +804,19 @@ function lunch() 


    export TARGET_BUILD_APPS=



    local product variant_and_version variant version

    # Support either <product>-<variant> or <product>-<release>-<variant>

    local product release_and_variant release variant

    product=${selection%%-*} # Trim everything after first dash

    variant_and_version=${selection#*-} # Trim everything up to first dash

    if [ "$variant_and_version" != "$selection" ]; then

        variant=${variant_and_version%%-*}

        if [ "$variant" != "$variant_and_version" ]; then

            version=${variant_and_version#*-}

    release_and_variant=${selection#*-} # Trim everything up to first dash

    if [ "$release_and_variant" != "$selection" ]; then

        local first=${release_and_variant%%-*} # Trim everything after first dash

        if [ "$first" != "$release_and_variant" ]; then

            # There is a 2nd dash, split into release-variant

            release=$first # Everything up to the dash

            variant=${release_and_variant#*-} # Trim everything up to dash

        else

            # There is not a 2nd dash, default to variant as the second param

            variant=$first

        fi

    fi
@@ -823,7 +829,7 @@ function lunch() 


    TARGET_PRODUCT=$product \

    TARGET_BUILD_VARIANT=$variant \

    TARGET_PLATFORM_VERSION=$version \

    TARGET_RELEASE=$release \

    build_build_var_cache

    if [ $? -ne 0 ]

    then
@@ -835,10 +841,10 @@ function lunch() 
    fi

    export TARGET_PRODUCT=$(get_build_var TARGET_PRODUCT)

    export TARGET_BUILD_VARIANT=$(get_build_var TARGET_BUILD_VARIANT)

    if [ -n "$version" ]; then

      export TARGET_PLATFORM_VERSION=$(get_build_var TARGET_PLATFORM_VERSION)

    if [ -n "$release" ]; then

      export TARGET_RELEASE=$(get_build_var TARGET_RELEASE)

    else

      unset TARGET_PLATFORM_VERSION

      unset TARGET_RELEASE

    fi

    export TARGET_BUILD_TYPE=release

core/product_config.mk

+1 −1

File changed.

Contains only whitespace changes.