diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-15 14:14:30 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-02-15 14:14:30 -0800 |
| commit | eed066b7ac0df859a0144ddde604e99ebf95d4d6 (patch) | |
| tree | 0f7e23cb3bee46701b33748c93f6e709ce64e4d1 /Android.v8common.mk | |
| parent | c0da2aebebbad031964546f63a3434225b0c83ab (diff) | |
| parent | f8d66dab97635631a6bc30fa0071a2eb22566264 (diff) | |
| download | android_external_v8-eed066b7ac0df859a0144ddde604e99ebf95d4d6.tar.gz android_external_v8-eed066b7ac0df859a0144ddde604e99ebf95d4d6.tar.bz2 android_external_v8-eed066b7ac0df859a0144ddde604e99ebf95d4d6.zip | |
resolved conflicts for merge of f8d66dab to master
Change-Id: I66e6f68b1c5b5d1f0ad5347eabe8b99e6f9bad77
Diffstat (limited to 'Android.v8common.mk')
| -rw-r--r-- | Android.v8common.mk | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/Android.v8common.mk b/Android.v8common.mk index 20125733..20a796a3 100644 --- a/Android.v8common.mk +++ b/Android.v8common.mk @@ -118,6 +118,28 @@ ifeq ($(TARGET_ARCH),arm) src/arm/stub-cache-arm.cc endif +ifeq ($(TARGET_ARCH),x86) + V8_LOCAL_SRC_FILES += \ + src/atomicops_internals_x86_gcc.cc \ + src/ia32/assembler-ia32.cc \ + src/ia32/builtins-ia32.cc \ + src/ia32/codegen-ia32.cc \ + src/ia32/code-stubs-ia32.cc \ + src/ia32/cpu-ia32.cc \ + src/ia32/debug-ia32.cc \ + src/ia32/deoptimizer-ia32.cc \ + src/ia32/disasm-ia32.cc \ + src/ia32/frames-ia32.cc \ + src/ia32/full-codegen-ia32.cc \ + src/ia32/ic-ia32.cc \ + src/ia32/lithium-codegen-ia32.cc \ + src/ia32/lithium-gap-resolver-ia32.cc \ + src/ia32/lithium-ia32.cc \ + src/ia32/macro-assembler-ia32.cc \ + src/ia32/regexp-macro-assembler-ia32.cc \ + src/ia32/stub-cache-ia32.cc +endif + # Enable DEBUG option. ifeq ($(DEBUG_V8),true) V8_LOCAL_SRC_FILES += \ |