am a28cdeee: Remove Android specific LUMP_OF_MEMORY.
* commit 'a28cdeeef5f062a40c344cbbbcf296873391bc58':
Remove Android specific LUMP_OF_MEMORY.
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)
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 :=
