summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk25
1 files changed, 5 insertions, 20 deletions
diff --git a/Android.mk b/Android.mk
index 925136c6..ccedc8e2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -27,25 +27,10 @@ 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)
+# Build libv8 and v8shell
+# TODO: remove the check when the v8 build is fixed for x86
+ifeq ($(TARGET_ARCH),arm)
include $(BASE_PATH)/Android.mksnapshot.mk
- endif
- include $(BASE_PATH)/Android.libv8.mk
- include $(BASE_PATH)/Android.v8shell.mk
+ include $(BASE_PATH)/Android.libv8.mk
+ include $(BASE_PATH)/Android.v8shell.mk
endif