From ef5113dcdbe0aba596dab6bfcd413d75fa246e21 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Thu, 15 May 2014 13:54:25 -0700 Subject: 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 --- build/Android.common.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build/Android.common.mk b/build/Android.common.mk index 75d360c4c3..7f33ee551b 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) -- cgit v1.2.3-59-g8ed1b