diff options
| author | Steve Block <steveblock@google.com> | 2012-02-02 08:46:52 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-02 08:46:52 -0800 |
| commit | 06c8278ba449c28e31123332039a4f9665fca7e9 (patch) | |
| tree | 265751c1714a029454923aec6773688b53a48c32 | |
| parent | 84c46ac876ce6afd30f132a408ce168b4c06af0f (diff) | |
| parent | d7a34d91def077ae0438f710f157e30f38539abe (diff) | |
| download | v8-06c8278ba449c28e31123332039a4f9665fca7e9.tar.gz | |
Merge "Remove makefile comments about switching between JSC and V8"
| -rw-r--r-- | Android.mk | 11 |
1 files changed, 3 insertions, 8 deletions
@@ -18,14 +18,9 @@ BASE_PATH := $(call my-dir) include $(CLEAR_VARS) -# Two ways to control which JS engine is used: -# 1. use JS_ENGINE environment variable, value can be either 'jsc' or 'v8' -# This is the preferred way. -# 2. if JS_ENGINE is not set, or is not 'jsc' or 'v8', this makefile picks -# up a default engine to build. -# To help setup buildbot, a new environment variable, USE_ALT_JS_ENGINE, -# can be set to true, so that two builds can be different but without -# specifying which JS engine to use. +ifneq ($(strip $(ARCH_ARM_HAVE_ARMV7A)),true) + $(error V8 requires ARM v7) +endif # Build libv8 and v8shell ifeq ($(TARGET_ARCH),arm) |