From 6a927b2a077ba8a767bd21abcfbf1c4e3d1b11e0 Mon Sep 17 00:00:00 2001
From: Andrei Popescu <andreip@google.com>
Date: Wed, 21 Apr 2010 13:05:17 +0100
Subject: Re-enable snapshots in V8.

Fix bug:  2612919

Change-Id: I8c3de4e0df95c9339aadd90e8367239911fe1cee
---
 Android.mk            | 1 +
 Android.mksnapshot.mk | 3 ++-
 CleanSpec.mk          | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index ccedc8e2..d8fea851 100644
--- a/Android.mk
+++ b/Android.mk
@@ -30,6 +30,7 @@ include $(CLEAR_VARS)
 # Build libv8 and v8shell
 # TODO: remove the check when the v8 build is fixed for x86
 ifeq ($(TARGET_ARCH),arm)
+    ENABLE_V8_SNAPSHOT = true
     include $(BASE_PATH)/Android.mksnapshot.mk
     include $(BASE_PATH)/Android.libv8.mk
     include $(BASE_PATH)/Android.v8shell.mk
diff --git a/Android.mksnapshot.mk b/Android.mksnapshot.mk
index 051a7475..db9678e3 100644
--- a/Android.mksnapshot.mk
+++ b/Android.mksnapshot.mk
@@ -56,7 +56,8 @@ LOCAL_CFLAGS := \
 	-Wno-format \
 	-ansi \
 	-fno-rtti \
-	-DENABLE_DEBUGGER_SUPPORT
+	-DENABLE_DEBUGGER_SUPPORT \
+	-DV8_NATIVE_REGEXP
 
 ifeq ($(TARGET_ARCH),arm)
   LOCAL_CFLAGS += -DV8_TARGET_ARCH_ARM
diff --git a/CleanSpec.mk b/CleanSpec.mk
index b84e1b65..7a097df6 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -44,6 +44,11 @@
 #$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
 #$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
 
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libv8_intermediates)
+$(call add-clean-step, rm -rf $(OUT_DIR)/host/$(HOST_OS)-$(HOST_ARCH)/bin/mksnapshot)
+$(call add-clean-step, rm -rf $(OUT_DIR)/host/$(HOST_OS)-$(HOST_ARCH)/obj/EXECUTABLES/mksnapshot_intermediates)
+
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
-- 
cgit v1.2.3