From 0332f0ac1ec69082d337e9990b964b883e5cf689 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Queru <jbq@google.com>
Date: Fri, 22 Oct 2010 09:52:09 -0700
Subject: [PATCH] Truly default to the full config.

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

Change-Id: I8b69b208bc4969d3f95c3467ca6737de8fd9460d
---
 core/envsetup.mk       | 2 +-
 envsetup.sh            | 8 ++++----
 target/product/full.mk | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/envsetup.mk b/core/envsetup.mk
index e2d4d11c6..fe8c47807 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 045e46417..8289c828c 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -311,7 +311,7 @@ function chooseproduct()
         if [ "$TARGET_SIMULATOR" = true ] ; then
             default_value=sim
         else
-            default_value=generic
+            default_value=full
         fi
     fi
 
@@ -465,7 +465,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
 
@@ -473,7 +473,7 @@ function lunch()
 
     if [ -z "$answer" ]
     then
-        selection=generic-eng
+        selection=full-eng
     elif [ "$answer" = "simulator" ]
     then
         selection=simulator
@@ -561,7 +561,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 c204aad2e..19c1e240a 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_PACKAGES := \
     OpenWnn \