commit af20a6081a6e8f84b43b99973974cd16e20760cd
author Jean-Baptiste Queru <jbq@google.com> Mon Jul 12 13:58:59 2010 -0700
committer Android Code Review <code-review@android.com> Mon Jul 12 13:58:59 2010 -0700
tree 94773ab6b2361479a6d8c87df2bbdc9228f2b4ef
parent 6f9318e0353a4ba7544d0b1b3c453d7859f576d7
parent cce6f923aaa84932d00b90f56ab3ef9a950dd949

Merge "Move buildspec vars to BoardConfig.mk"

core/combo/TARGET_linux-x86.mk

diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk
index 0613797..6d123d0 100644
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@ -159,7 +159,7 @@
 	$(TARGET_CRTEND_O)
 endef
 
-TARGET_GLOBAL_CFLAGS += -m32
+TARGET_GLOBAL_CFLAGS += -m32 -D__ANDROID__
 TARGET_GLOBAL_LDFLAGS += -m32
 
 endif #simulator

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index 0a12e84..c0d17a0 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -433,6 +433,7 @@
 
 # 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