diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2010-10-22 12:12:52 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-22 12:12:52 -0700 |
commit | 6c75cb3752d51adfd3c7b72672f5abacdc4cf2bd (patch) | |
tree | de5d889391f139de0959d41230967ddc0b304c85 | |
parent | a1729fc593bbed525184e4fee14c18bf20100795 (diff) | |
parent | 0332f0ac1ec69082d337e9990b964b883e5cf689 (diff) | |
download | build-6c75cb3752d51adfd3c7b72672f5abacdc4cf2bd.zip build-6c75cb3752d51adfd3c7b72672f5abacdc4cf2bd.tar.gz build-6c75cb3752d51adfd3c7b72672f5abacdc4cf2bd.tar.bz2 |
am 0332f0ac: Truly default to the full config.
-rw-r--r-- | core/envsetup.mk | 2 | ||||
-rw-r--r-- | envsetup.sh | 8 | ||||
-rw-r--r-- | target/product/full.mk | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/core/envsetup.mk b/core/envsetup.mk index a8592a4..c8c5634 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -26,7 +26,7 @@ ifeq ($(TARGET_PRODUCT),) ifeq ($(TARGET_SIMULATOR),true) TARGET_PRODUCT := sim else -TARGET_PRODUCT := generic +TARGET_PRODUCT := full endif endif diff --git a/envsetup.sh b/envsetup.sh index bfafbb7..4b2c19e 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -312,7 +312,7 @@ function chooseproduct() if [ "$TARGET_SIMULATOR" = true ] ; then default_value=sim else - default_value=generic + default_value=full fi fi @@ -466,7 +466,7 @@ function lunch() answer=$1 else print_lunch_menu - echo -n "Which would you like? [generic-eng] " + echo -n "Which would you like? [full-eng] " read answer fi @@ -474,7 +474,7 @@ function lunch() if [ -z "$answer" ] then - selection=generic-eng + selection=full-eng elif [ "$answer" = "simulator" ] then selection=simulator @@ -575,7 +575,7 @@ function tapas() apps=all fi - export TARGET_PRODUCT=generic + export TARGET_PRODUCT=full export TARGET_BUILD_VARIANT=$variant export TARGET_SIMULATOR=false export TARGET_BUILD_TYPE=release diff --git a/target/product/full.mk b/target/product/full.mk index 3e55d5e..1c88500 100644 --- a/target/product/full.mk +++ b/target/product/full.mk @@ -16,8 +16,8 @@ # 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 -# build of the emulator, but all those aspects can be overridden -# in inherited configurations. +# build quite specifically for the emulator, and might not be +# entirely appropriate to inherit from for on-device configurations. PRODUCT_PROPERTY_OVERRIDES := \ ro.com.android.dataroaming=true \ |