summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-06-14 18:25:07 +0100
committerBen Murdoch <benm@google.com>2011-06-14 23:11:04 +0100
commitd85c14422ed4297762a73b74af12e7957a63cb74 (patch)
tree9993247be561e58478c8331890fd1eb281851114 /Android.mk
parente4d3f20695afafa5a30718ed0f04d3230b2b58cd (diff)
downloadandroid_external_v8-d85c14422ed4297762a73b74af12e7957a63cb74.tar.gz
android_external_v8-d85c14422ed4297762a73b74af12e7957a63cb74.tar.bz2
android_external_v8-d85c14422ed4297762a73b74af12e7957a63cb74.zip
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
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk7
1 files changed, 0 insertions, 7 deletions
diff --git a/Android.mk b/Android.mk
index 1c9ceb59..c69a2ccd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -30,13 +30,6 @@ include $(CLEAR_VARS)
# 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