Get snapshots in v8 to work again
diff --git a/Android.libv8.mk b/Android.libv8.mk
index cced26e..0d82e3d 100644
--- a/Android.libv8.mk
+++ b/Android.libv8.mk
@@ -9,9 +9,6 @@
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
intermediates := $(call local-intermediates-dir)
-#ENABLE_V8_SNAPSHOT:=true
-#include $(LOCAL_PATH)/Android.mksnapshot.mk
-
# Android.v8common.mk defines common V8_LOCAL_SRC_FILES
# and V8_LOCAL_JS_LIBRARY_FILES
V8_LOCAL_SRC_FILES :=
@@ -48,14 +45,15 @@
# Generate snapshot.cc
ifeq ($(ENABLE_V8_SNAPSHOT),true)
-GEN := $(intermediates)/snapshot.cc
-$(GEN): MKSNAPSHOT := $(HOST_OUT_EXECUTABLES)/mksnapshot
+SNAP_GEN := $(intermediates)/snapshot.cc
+$(SNAP_GEN): MKSNAPSHOT := $(HOST_OUT_EXECUTABLES)/mksnapshot
# mksnapshot is the module name. This dependency rule makes sure that mksnapshot
# is built before calling the following rule.
-$(GEN): mksnapshot
+$(SNAP_GEN): mksnapshot
@echo "Generating snapshot.cc"
@mkdir -p $(dir $@)
- $(MKSNAPSHOT) $(GEN)
+ @echo $(MKSNAPSHOT) $(SNAP_GEN)
+ $(MKSNAPSHOT) $(SNAP_GEN)
LOCAL_GENERATED_SOURCES += $(intermediates)/snapshot.cc
else
LOCAL_SRC_FILES += \
diff --git a/Android.mksnapshot.mk b/Android.mksnapshot.mk
index 6e2e299..bcb7698 100644
--- a/Android.mksnapshot.mk
+++ b/Android.mksnapshot.mk
@@ -65,8 +65,6 @@
LOCAL_CFLAGS += -DV8_TARGET_ARCH_IA32
endif
-LOCAL_CFLAGS += -DENABLE_LOGGING_AND_PROFILING
-
LOCAL_C_INCLUDES := $(LOCAL_PATH)/src
# This is on host.
diff --git a/Android.v8common.mk b/Android.v8common.mk
index 75aa4bc..28891db 100644
--- a/Android.v8common.mk
+++ b/Android.v8common.mk
@@ -75,6 +75,7 @@
src/arm/assembler-arm.cc \
src/arm/builtins-arm.cc \
src/arm/codegen-arm.cc \
+ src/arm/constants-arm.cc \
src/arm/cpu-arm.cc \
src/arm/disasm-arm.cc \
src/arm/frames-arm.cc \