diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-10 12:46:37 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-08-10 12:46:37 -0700 |
| commit | 8003b9b6c8e9091fe74c1ce2193448f1cba6683d (patch) | |
| tree | 5db3f681940f704df438f13754384468b99d8eb6 /Android.mk | |
| parent | 08d4f3a1420ec9ed70ef67fc9a662dd47bc353e5 (diff) | |
| parent | 2461b847d44e0dfa125b5d7c566a52d3da2eb1df (diff) | |
| download | android_external_v8-8003b9b6c8e9091fe74c1ce2193448f1cba6683d.tar.gz android_external_v8-8003b9b6c8e9091fe74c1ce2193448f1cba6683d.tar.bz2 android_external_v8-8003b9b6c8e9091fe74c1ce2193448f1cba6683d.zip | |
resolved conflicts for merge of 2461b847 to jb-mr1-dev
Change-Id: If6f3619904a44a71bd8814e00cfcfd96abdf534c
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -24,7 +24,7 @@ ifeq ($(TARGET_ARCH),arm) endif # Build libv8 and d8 -ifneq ($(filter $(TARGET_ARCH),x86 arm),) +ifneq ($(filter $(TARGET_ARCH),x86 arm mips),) ENABLE_V8_SNAPSHOT = true include $(BASE_PATH)/Android.mksnapshot.mk include $(BASE_PATH)/Android.libv8.mk |