diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-08 13:09:36 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-08 13:09:36 -0700 |
| commit | 08d4f3a1420ec9ed70ef67fc9a662dd47bc353e5 (patch) | |
| tree | a470c45b0ae1a464a232542bd580f7389fa1d93d | |
| parent | 58c8a7a173a8280b0b1abe59c6f61fc3cc11b819 (diff) | |
| parent | da68f488bd070bbfdbe1e9cb71f9912327db9ec0 (diff) | |
| download | android_external_v8-08d4f3a1420ec9ed70ef67fc9a662dd47bc353e5.tar.gz android_external_v8-08d4f3a1420ec9ed70ef67fc9a662dd47bc353e5.tar.bz2 android_external_v8-08d4f3a1420ec9ed70ef67fc9a662dd47bc353e5.zip | |
am da68f488: Merge "Fix the compilation issue with mksnapshot for x86 target"
* commit 'da68f488bd070bbfdbe1e9cb71f9912327db9ec0':
Fix the compilation issue with mksnapshot for x86 target
| -rw-r--r-- | Android.mksnapshot.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Android.mksnapshot.mk b/Android.mksnapshot.mk index 1672963a..f73549b0 100644 --- a/Android.mksnapshot.mk +++ b/Android.mksnapshot.mk @@ -18,9 +18,12 @@ include $(LOCAL_PATH)/Android.v8common.mk V8_LOCAL_SRC_FILES += \ src/mksnapshot.cc \ - src/arm/simulator-arm.cc \ src/snapshot-empty.cc +ifeq ($(TARGET_ARCH),arm) +V8_LOCAL_SRC_FILES += src/arm/simulator-arm.cc +endif + ifeq ($(HOST_ARCH),x86) V8_LOCAL_SRC_FILES += src/atomicops_internals_x86_gcc.cc endif |