Re-enable snapshots in V8.
Fix bug: 2612919
Change-Id: I8c3de4e0df95c9339aadd90e8367239911fe1cee
diff --git a/Android.mk b/Android.mk
index ccedc8e..d8fea85 100644
--- a/Android.mk
+++ b/Android.mk
@@ -30,6 +30,7 @@
# 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 051a747..db9678e 100644
--- a/Android.mksnapshot.mk
+++ b/Android.mksnapshot.mk
@@ -56,7 +56,8 @@
-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 b84e1b6..7a097df 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
# ************************************************
