am 0332f0ac
: Truly default to the full config.
This commit is contained in:
committed by
Android Git Automerger
commit
6c75cb3752
@@ -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
|
||||||
|
|
||||||
|
@@ -312,7 +312,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
|
||||||
|
|
||||||
@@ -466,7 +466,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
|
||||||
|
|
||||||
@@ -474,7 +474,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
|
||||||
@@ -575,7 +575,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
|
||||||
|
@@ -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_PROPERTY_OVERRIDES := \
|
PRODUCT_PROPERTY_OVERRIDES := \
|
||||||
ro.com.android.dataroaming=true \
|
ro.com.android.dataroaming=true \
|
||||||
|
Reference in New Issue
Block a user