summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2014-05-15 13:54:25 -0700
committerAndreas Gampe <agampe@google.com>2014-05-15 14:34:47 -0700
commitef5113dcdbe0aba596dab6bfcd413d75fa246e21 (patch)
treec5ed9793f97fe8b42c6d0aceeb40357d96ff2682 /build
parent0e78ff7ee6b4dadb9c10b4b1ba2860ccbcaf22bd (diff)
downloadart-ef5113dcdbe0aba596dab6bfcd413d75fa246e21.zip
art-ef5113dcdbe0aba596dab6bfcd413d75fa246e21.tar.gz
art-ef5113dcdbe0aba596dab6bfcd413d75fa246e21.tar.bz2
ART: Make build error a warning for TARGET_CPU_SMP
Builds that do not build for targets will not have this information. Make it a warning. Change-Id: Ibd5fa6f5d2c1cf6d86de30df24d25eddb23fb81d
Diffstat (limited to 'build')
-rw-r--r--build/Android.common.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/build/Android.common.mk b/build/Android.common.mk
index 75d360c..7f33ee5 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -254,7 +254,9 @@ else
ifeq ($(TARGET_CPU_SMP),false)
ART_TARGET_CFLAGS += -DANDROID_SMP=0
else
- $(error TARGET_CPU_SMP must be (true|false), found $(TARGET_CPU_SMP))
+ $(warning TARGET_CPU_SMP should be (true|false), found $(TARGET_CPU_SMP))
+ # Make sure we emit barriers for the worst case.
+ ART_TARGET_CFLAGS += -DANDROID_SMP=1
endif
endif
ART_TARGET_CFLAGS += $(ART_DEFAULT_GC_TYPE_CFLAGS)