diff options
| -rw-r--r-- | Android.libv8.mk | 4 | ||||
| -rw-r--r-- | Android.mk | 11 | ||||
| -rw-r--r-- | Android.mksnapshot.mk | 4 | ||||
| -rw-r--r-- | Android.v8common.mk | 18 |
4 files changed, 4 insertions, 33 deletions
diff --git a/Android.libv8.mk b/Android.libv8.mk index 192a4775..dab66d58 100644 --- a/Android.libv8.mk +++ b/Android.libv8.mk @@ -73,10 +73,6 @@ ifeq ($(TARGET_ARCH),arm) LOCAL_CFLAGS += -DARM -DV8_TARGET_ARCH_ARM endif -ifeq ($(TARGET_ARCH),x86) - LOCAL_CFLAGS += -DV8_TARGET_ARCH_IA32 -endif - ifeq ($(ENABLE_V8_LOGGING_AND_PROFILING),true) LOCAL_CFLAGS += -DENABLE_LOGGING_AND_PROFILING endif @@ -28,10 +28,7 @@ include $(CLEAR_VARS) # specifying which JS engine to use. # Build libv8 and v8shell -# TODO: remove the check when the v8 build is fixed for x86 -ifeq ($(TARGET_ARCH),arm) - ENABLE_V8_SNAPSHOT = true - include $(BASE_PATH)/Android.mksnapshot.mk - include $(BASE_PATH)/Android.libv8.mk - include $(BASE_PATH)/Android.v8shell.mk -endif +ENABLE_V8_SNAPSHOT = true +include $(BASE_PATH)/Android.mksnapshot.mk +include $(BASE_PATH)/Android.libv8.mk +include $(BASE_PATH)/Android.v8shell.mk diff --git a/Android.mksnapshot.mk b/Android.mksnapshot.mk index db9678e3..45be0c11 100644 --- a/Android.mksnapshot.mk +++ b/Android.mksnapshot.mk @@ -70,10 +70,6 @@ ifeq ($(TARGET_CPU_ABI),armeabi-v7a) endif -ifeq ($(TARGET_ARCH),x86) - LOCAL_CFLAGS += -DV8_TARGET_ARCH_IA32 -endif - ifeq ($(DEBUG_V8),true) LOCAL_CFLAGS += -DDEBUG -UNDEBUG endif diff --git a/Android.v8common.mk b/Android.v8common.mk index 0a57ce6e..98396ab2 100644 --- a/Android.v8common.mk +++ b/Android.v8common.mk @@ -122,24 +122,6 @@ ifeq ($(TARGET_ARCH),arm) src/arm/virtual-frame-arm.cc endif -ifeq ($(TARGET_ARCH),x86) - V8_LOCAL_SRC_FILES += \ - src/ia32/assembler-ia32.cc \ - src/ia32/builtins-ia32.cc \ - src/ia32/codegen-ia32.cc \ - src/ia32/code-stubs-arm.cc \ - src/ia32/cpu-ia32.cc \ - src/ia32/disasm-ia32.cc \ - src/ia32/frames-ia32.cc \ - src/ia32/ic-ia32.cc \ - src/ia32/jump-target-ia32.cc \ - src/ia32/macro-assembler-ia32.cc \ - src/ia32/regexp-macro-assembler-ia32.cc \ - src/ia32/register-allocator-ia32.cc \ - src/ia32/stub-cache-ia32.cc \ - src/ia32/virtual-frame-ia32.cc -endif - # Enable DEBUG option. ifeq ($(DEBUG_V8),true) V8_LOCAL_SRC_FILES += \ |