diff options
| author | Andreas Gampe <agampe@google.com> | 2014-05-15 21:45:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-15 21:45:44 +0000 |
| commit | 8bebd1a8dae414f742424b6714ae90636238f18a (patch) | |
| tree | 63b8b02ae5c83b312bdce596d07c36dca5e6dff6 /build/Android.common.mk | |
| parent | 3b2bcbf9daf39f4cece7fde1186f3fa494000ed9 (diff) | |
| parent | ef5113dcdbe0aba596dab6bfcd413d75fa246e21 (diff) | |
| download | art-8bebd1a8dae414f742424b6714ae90636238f18a.zip art-8bebd1a8dae414f742424b6714ae90636238f18a.tar.gz art-8bebd1a8dae414f742424b6714ae90636238f18a.tar.bz2 | |
Merge "ART: Make build error a warning for TARGET_CPU_SMP"
Diffstat (limited to 'build/Android.common.mk')
| -rw-r--r-- | build/Android.common.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/build/Android.common.mk b/build/Android.common.mk index c108558..39601e4 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) |