diff --git a/Android.mk b/Android.mk
index e21b736..ccedc8e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -28,11 +28,9 @@
 #    specifying which JS engine to use.
 
 # 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
+# TODO: remove the check when the v8 build is fixed for x86
+ifeq ($(TARGET_ARCH),arm)
+    include $(BASE_PATH)/Android.mksnapshot.mk
+    include $(BASE_PATH)/Android.libv8.mk
+    include $(BASE_PATH)/Android.v8shell.mk
 endif
-include $(BASE_PATH)/Android.libv8.mk
-include $(BASE_PATH)/Android.v8shell.mk