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

Commit 8a545e04 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by David 'Digit' Turner
Browse files

Truly default to the full config. 

It is much better than generic for emulator-based work.

Orig-Change-Id: I8b69b208bc4969d3f95c3467ca6737de8fd9460d
parent f7f5479b

core/envsetup.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ ifeq ($(TARGET_PRODUCT),) 
ifeq ($(TARGET_SIMULATOR),true)

ifeq ($(TARGET_SIMULATOR),true)

TARGET_PRODUCT := sim

TARGET_PRODUCT := sim

else

else

TARGET_PRODUCT := generic

TARGET_PRODUCT := full

endif

endif

endif

endif

envsetup.sh

+4 −4
Original line number Original line Diff line number Diff line
@@ -314,7 +314,7 @@ function chooseproduct() 
        if [ "$TARGET_SIMULATOR" = true ] ; then

        if [ "$TARGET_SIMULATOR" = true ] ; then

            default_value=sim

            default_value=sim

        else

        else

            default_value=generic

            default_value=full

        fi

        fi

    fi

    fi
@@ -468,7 +468,7 @@ function lunch() 
        answer=$1

        answer=$1

    else

    else

        print_lunch_menu

        print_lunch_menu

        echo -n "Which would you like? [generic-eng] "

        echo -n "Which would you like? [full-eng] "

        read answer

        read answer

    fi

    fi
@@ -476,7 +476,7 @@ function lunch() 




    if [ -z "$answer" ]

    if [ -z "$answer" ]

    then

    then

        selection=generic-eng

        selection=full-eng

    elif [ "$answer" = "simulator" ]

    elif [ "$answer" = "simulator" ]

    then

    then

        selection=simulator

        selection=simulator
@@ -564,7 +564,7 @@ function tapas() 
        apps=all

        apps=all

    fi

    fi





    export TARGET_PRODUCT=generic

    export TARGET_PRODUCT=full

    export TARGET_BUILD_VARIANT=$variant

    export TARGET_BUILD_VARIANT=$variant

    export TARGET_SIMULATOR=false

    export TARGET_SIMULATOR=false

    export TARGET_BUILD_TYPE=release

    export TARGET_BUILD_TYPE=release

target/product/full.mk

+2 −2
Original line number Original line Diff line number Diff line
@@ -16,8 +16,8 @@ 




# This is a build configuration for a full-featured build of the

# This is a build configuration for a full-featured build of the

# Open-Source part of the tree. It's geared toward a US-centric

# Open-Source part of the tree. It's geared toward a US-centric

# build of the emulator, but all those aspects can be overridden

# build quite specifically for the emulator, and might not be

# in inherited configurations.

# entirely appropriate to inherit from for on-device configurations.





PRODUCT_PACKAGES := \

PRODUCT_PACKAGES := \

    OpenWnn \

    OpenWnn \