commit 6331c683f5e6a2a3400ccbdafc79920e0f44593b
author Ben Murdoch <benm@google.com> Thu May 24 09:23:34 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu May 24 09:23:34 2012 -0700
tree befbd35746223bac3b9ffc4429fb936f97966f57
parent 21eaa3b0abc4562dac0be1acebe2fdf35335e752
parent 4768e9d22b13edbae2ae177109420028748bf872

am 4768e9d2: Merge V8 at 3.9.24.29

* commit '4768e9d22b13edbae2ae177109420028748bf872':
  Merge V8 at 3.9.24.29

Android.libv8.mk

diff --git a/Android.libv8.mk b/Android.libv8.mk
index e7c4135..81d8296 100644
--- a/Android.libv8.mk
+++ b/Android.libv8.mk
@@ -11,8 +11,8 @@
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 intermediates := $(call local-intermediates-dir)
 
-PRIVATE_CLEAN_FILES := $(HOST_OUT)/bin/mksnapshot \
-    $(HOST_OUT)/obj/EXECUTABLES/mksnapshot_intermediates
+PRIVATE_CLEAN_FILES := $(HOST_OUT)/bin/mksnapshot.$(TARGET_ARCH) \
+    $(HOST_OUT)/obj/EXECUTABLES/mksnapshot.$(TARGET_ARCH)_intermediates
 
 # Android.v8common.mk defines common V8_LOCAL_SRC_FILES
 # and V8_LOCAL_JS_LIBRARY_FILES
@@ -65,7 +65,7 @@
 # Generate snapshot.cc
 ifeq ($(ENABLE_V8_SNAPSHOT),true)
 SNAP_GEN := $(intermediates)/snapshot.cc
-MKSNAPSHOT := $(HOST_OUT_EXECUTABLES)/mksnapshot
+MKSNAPSHOT := $(HOST_OUT_EXECUTABLES)/mksnapshot.$(TARGET_ARCH)
 $(SNAP_GEN): PRIVATE_CUSTOM_TOOL = $(MKSNAPSHOT) --logfile $(intermediates)/v8.log $(SNAP_GEN)
 $(SNAP_GEN): $(MKSNAPSHOT)
 	$(transform-generated-source)

Android.mksnapshot.mk

diff --git a/Android.mksnapshot.mk b/Android.mksnapshot.mk
index a94c02b..1672963 100644
--- a/Android.mksnapshot.mk
+++ b/Android.mksnapshot.mk
@@ -6,8 +6,9 @@
 
 # Set up the target identity
 LOCAL_IS_HOST_MODULE := true
-LOCAL_MODULE := mksnapshot
+LOCAL_MODULE := mksnapshot.$(TARGET_ARCH)
 LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_MODULE_TAGS = optional
 intermediates := $(call local-intermediates-dir)
 
 V8_LOCAL_SRC_FILES :=