commit 08d4f3a1420ec9ed70ef67fc9a662dd47bc353e5
author Jean-Baptiste Queru <jbq@google.com> Wed Aug 08 13:09:36 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 08 13:09:36 2012 -0700
tree a470c45b0ae1a464a232542bd580f7389fa1d93d
parent 58c8a7a173a8280b0b1abe59c6f61fc3cc11b819
parent da68f488bd070bbfdbe1e9cb71f9912327db9ec0

am da68f488: Merge "Fix the compilation issue with mksnapshot for x86 target"

* commit 'da68f488bd070bbfdbe1e9cb71f9912327db9ec0':
  Fix the compilation issue with mksnapshot for x86 target

Android.mksnapshot.mk

diff --git a/Android.mksnapshot.mk b/Android.mksnapshot.mk
index 1672963..f73549b 100644
--- a/Android.mksnapshot.mk
+++ b/Android.mksnapshot.mk
@@ -18,9 +18,12 @@
 
 V8_LOCAL_SRC_FILES += \
   src/mksnapshot.cc \
-  src/arm/simulator-arm.cc \
   src/snapshot-empty.cc
 
+ifeq ($(TARGET_ARCH),arm)
+V8_LOCAL_SRC_FILES += src/arm/simulator-arm.cc
+endif
+
 ifeq ($(HOST_ARCH),x86)
 V8_LOCAL_SRC_FILES += src/atomicops_internals_x86_gcc.cc
 endif