X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=core%2Fenvsetup.mk;fp=core%2Fenvsetup.mk;h=3c952dd4c6571daa7fbe60b5aabaf4c8fbec193c;hb=5f4e61ddd475b301a9405e22add6a46d7005ca03;hp=6d14753c1af1397221c5b5c0ebfbc0624bde2083;hpb=bbf517c1c97a219cd3b0500e0124cc72a2672c80;p=android-x86%2Fbuild.git

diff --git a/core/envsetup.mk b/core/envsetup.mk
index 6d14753c1..3c952dd4c 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 := generic_x86
 endif
 endif
 
@@ -127,11 +127,15 @@ TARGET_ARCH := $(HOST_ARCH)
 TARGET_OS := $(HOST_OS)
 else
 ifeq ($(TARGET_ARCH),)
-TARGET_ARCH := arm
+TARGET_ARCH := $(if $(call is_inherited_from,$(INTERNAL_PRODUCT),generic_x86.mk),x86,arm)
 endif
 TARGET_OS := linux
 endif
 
+ifeq ($(TARGET_ARCH),x86)
+  DISABLE_DEXPREOPT := true
+endif
+
 # the target build type defaults to release
 ifneq ($(TARGET_BUILD_TYPE),debug)
 TARGET_BUILD_TYPE := release