diff options
| author | Patrick Scott <phanna@android.com> | 2010-03-10 14:50:10 -0500 |
|---|---|---|
| committer | Patrick Scott <phanna@android.com> | 2010-03-10 14:50:10 -0500 |
| commit | 7cf6db35b06497e21a38727eb34fbdb3065e2110 (patch) | |
| tree | 59ff5feb6ee953ea1878201f98b10a132009bd1f | |
| parent | 599f79f4efe2e253420db50c7dd5e691928e646e (diff) | |
| download | v8-7cf6db35b06497e21a38727eb34fbdb3065e2110.tar.gz | |
Fix the build.
Always compile libv8, we should have been doing this anyway to avoid breaking v8
with other changes.
Change-Id: I31502fdb463e914569138085c30294910f0b6903
| -rw-r--r-- | Android.mk | 29 |
1 files changed, 8 insertions, 21 deletions
@@ -27,25 +27,12 @@ include $(CLEAR_VARS) # can be set to true, so that two builds can be different but without # specifying which JS engine to use. -NEED_V8 = false -ifeq ($(JS_ENGINE),v8) - NEED_V8 = true -else - ifneq ($(JS_ENGINE),jsc) - ifeq ($(USE_ALT_JS_ENGINE),true) - NEED_V8 = true - endif - endif -endif - -ifeq ($(NEED_V8),true) - # Build libv8 and v8shell - # Temporarily enable snapshot support. - # TODO(andreip): re-enable this after the experiment - ENABLE_V8_SNAPSHOT = true - ifeq ($(ENABLE_V8_SNAPSHOT),true) - include $(BASE_PATH)/Android.mksnapshot.mk - endif - include $(BASE_PATH)/Android.libv8.mk - include $(BASE_PATH)/Android.v8shell.mk +# Build libv8 and v8shell +# Temporarily enable snapshot support. +# TODO(andreip): re-enable this after the experiment +ENABLE_V8_SNAPSHOT = true +ifeq ($(ENABLE_V8_SNAPSHOT),true) + include $(BASE_PATH)/Android.mksnapshot.mk endif +include $(BASE_PATH)/Android.libv8.mk +include $(BASE_PATH)/Android.v8shell.mk |