diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-11-18 16:15:31 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-11-18 18:54:43 -0800 |
| commit | eaf99024ae65895f4d843fbdd46702432d65d821 (patch) | |
| tree | 3234976a1020f88749d8f0343ea03c5f5eaec843 /Android.mk | |
| parent | 070d681b70d6b336bc04ed0a9b59357fd21b2bf0 (diff) | |
| parent | 1271ef1d193abf567937ab57edf19913f5800166 (diff) | |
| download | android_external_v8-eaf99024ae65895f4d843fbdd46702432d65d821.tar.gz android_external_v8-eaf99024ae65895f4d843fbdd46702432d65d821.tar.bz2 android_external_v8-eaf99024ae65895f4d843fbdd46702432d65d821.zip | |
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/v8 into mr1-stagingcm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2cm-10.1-M1mr1.1-stagingcm-10.1
Change-Id: Iff111b801ef69b5addbcdf36aec607726a491f37
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 10 |
1 files changed, 3 insertions, 7 deletions
@@ -23,14 +23,10 @@ ifeq ($(TARGET_ARCH),arm) endif endif -# Build libv8 and v8shell -ifneq ($(filter $(TARGET_ARCH),x86 arm),) - ifeq ($(ARCH_ARM_HAVE_ARMV7A),true) - ifneq ($(ARCH_ARM_HAVE_ARMV7A_BUG),true) +# Build libv8 and d8 +ifneq ($(filter $(TARGET_ARCH),x86 arm mips),) ENABLE_V8_SNAPSHOT = true include $(BASE_PATH)/Android.mksnapshot.mk - endif - endif include $(BASE_PATH)/Android.libv8.mk - include $(BASE_PATH)/Android.v8shell.mk + include $(BASE_PATH)/Android.d8.mk endif |