commit bdb72318e47d38df2180bd00d0fd0a97bdc82255
author Jean-Baptiste Queru <jbq@google.com> Thu May 12 08:52:59 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu May 12 08:52:59 2011 -0700
tree 8fbd90b9736a36a16ab30d2d7776e41b7efab679
parent 477e963276a1fb3759cbf40fc4ea1039b0d22057
parent 5372220a1a12a715ca1242dcc3f4b11b89a8387a

am 5372220a: Merge "Remove simulator from the lunch menu"

* commit '5372220a1a12a715ca1242dcc3f4b11b89a8387a':
  Remove simulator from the lunch menu

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index 29935de..2386e1c 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -434,12 +434,6 @@
 add_lunch_combo full_x86-eng
 add_lunch_combo vbox_x86-eng
 
-# if we're on linux, add the simulator.  There is a special case
-# in lunch to deal with the simulator
-if [ "$(uname)" = "Linux" ] ; then
-    add_lunch_combo simulator
-fi
-
 function print_lunch_menu()
 {
     local uname=$(uname)