am bdb72318: am 5372220a: Merge "Remove simulator from the lunch menu"
* commit 'bdb72318e47d38df2180bd00d0fd0a97bdc82255':
Remove simulator from the lunch menu
diff --git a/envsetup.sh b/envsetup.sh
index e0b5748..8b36bba 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -436,12 +436,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)