diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-08 12:58:28 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-08-08 12:58:28 -0700 |
| commit | da68f488bd070bbfdbe1e9cb71f9912327db9ec0 (patch) | |
| tree | 9b899cadcf335ca1927ea1baec5dd8ce89edf562 | |
| parent | 7258f76d52e4d15dd8e5d4abb79ad135d82fdc4f (diff) | |
| parent | 749e8943526482d432828bc4e08d9bf711f446d2 (diff) | |
| download | android_external_v8-da68f488bd070bbfdbe1e9cb71f9912327db9ec0.tar.gz android_external_v8-da68f488bd070bbfdbe1e9cb71f9912327db9ec0.tar.bz2 android_external_v8-da68f488bd070bbfdbe1e9cb71f9912327db9ec0.zip | |
Merge "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 |