Fix snapshotting
The flags that enable crankshaft in libv8 also need to be
passed into mksnapshot so that we generate a compatible
snapshot.cc.
Also remove the code that made crankshaft configurable as it
is now always on.
Change-Id: I3c2c58b1ef72269ea551752a7bb65baf8ad43b72
diff --git a/Android.libv8.mk b/Android.libv8.mk
index 27de47c..a7abe3c 100644
--- a/Android.libv8.mk
+++ b/Android.libv8.mk
@@ -65,13 +65,11 @@
-Wno-import \
-Wno-format \
-fno-exceptions \
+ -fvisibility=hidden \
-DENABLE_DEBUGGER_SUPPORT \
- -DV8_NATIVE_REGEXP \
- -fvisibility=hidden
-
-ifeq ($(ENABLE_V8_CRANKSHAFT),true)
- LOCAL_CFLAGS += -DENABLE_VMSTATE_TRACKING -DENABLE_LOGGING_AND_PROFILING
-endif
+ -DENABLE_LOGGING_AND_PROFILING \
+ -DENABLE_VMSTATE_TRACKING \
+ -DV8_NATIVE_REGEXP
ifeq ($(TARGET_ARCH),arm)
LOCAL_CFLAGS += -DARM -DV8_TARGET_ARCH_ARM
diff --git a/Android.mk b/Android.mk
index 1c9ceb5..c69a2cc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -30,13 +30,6 @@
# Build libv8 and v8shell
ifeq ($(TARGET_ARCH),arm)
ENABLE_V8_SNAPSHOT = true
- ENABLE_V8_CRANKSHAFT = false
- ifeq ($(ENABLE_V8_CRANKSHAFT),true)
- ifeq ($(ENABLE_V8_SNAPSHOT),true)
- # Snapshotting and crankshaft do not work well together right now.
- $(error Cannot build V8 with both crankshaft and snapshotting)
- endif
- endif
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 45be0c1..b8462ac 100644
--- a/Android.mksnapshot.mk
+++ b/Android.mksnapshot.mk
@@ -57,6 +57,8 @@
-ansi \
-fno-rtti \
-DENABLE_DEBUGGER_SUPPORT \
+ -DENABLE_LOGGING_AND_PROFILING \
+ -DENABLE_VMSTATE_TRACKING \
-DV8_NATIVE_REGEXP
ifeq ($(TARGET_ARCH),arm)
@@ -69,7 +71,6 @@
endif
endif
-
ifeq ($(DEBUG_V8),true)
LOCAL_CFLAGS += -DDEBUG -UNDEBUG
endif
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 49ab2c1..5f4ea42 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -53,6 +53,9 @@
$(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)
+$(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
# ************************************************