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.mksnapshot.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.mksnapshot.mk')
| -rw-r--r-- | Android.mksnapshot.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Android.mksnapshot.mk b/Android.mksnapshot.mk index c1ffcea3..d52d2af9 100644 --- a/Android.mksnapshot.mk +++ b/Android.mksnapshot.mk @@ -82,6 +82,10 @@ ifeq ($(TARGET_CPU_ABI),armeabi-v7a) endif endif +ifeq ($(TARGET_ARCH),x86) + LOCAL_CFLAGS += -DV8_TARGET_ARCH_IA32 +endif + ifeq ($(DEBUG_V8),true) LOCAL_CFLAGS += -DDEBUG -UNDEBUG endif |