diff --git a/envsetup.sh b/envsetup.sh
index 0a12e8465..c0d17a0b1 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -433,6 +433,7 @@ function add_lunch_combo()
 
 # add the default one here
 add_lunch_combo full-eng
+add_lunch_combo generic_x86-eng
 
 # if we're on linux, add the simulator.  There is a special case
 # in lunch to deal with the simulator