diff options
| author | Andreas Gampe <agampe@google.com> | 2014-05-15 19:34:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-15 19:34:41 +0000 |
| commit | b2c3e10deb6a2f069748c7a48e778a5da66900fd (patch) | |
| tree | e169cabde7c6b44c346273ed49d5a5bf6d1c1c1e /build/Android.common.mk | |
| parent | 3ba5511665ffd31cc766fe7774a94eb18696a845 (diff) | |
| parent | b14329f90f725af0f67c45dfcb94933a426d63ce (diff) | |
| download | art-b2c3e10deb6a2f069748c7a48e778a5da66900fd.zip art-b2c3e10deb6a2f069748c7a48e778a5da66900fd.tar.gz art-b2c3e10deb6a2f069748c7a48e778a5da66900fd.tar.bz2 | |
Merge "ART: Fix MonitorExit code on ARM"
Diffstat (limited to 'build/Android.common.mk')
| -rw-r--r-- | build/Android.common.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/build/Android.common.mk b/build/Android.common.mk index a4f13b8..75d360c 100644 --- a/build/Android.common.mk +++ b/build/Android.common.mk @@ -251,7 +251,11 @@ ART_TARGET_CFLAGS := $(art_cflags) -DART_TARGET -DART_BASE_ADDRESS=$(LIBART_IMG_ ifeq ($(TARGET_CPU_SMP),true) ART_TARGET_CFLAGS += -DANDROID_SMP=1 else - ART_TARGET_CFLAGS += -DANDROID_SMP=0 + ifeq ($(TARGET_CPU_SMP),false) + ART_TARGET_CFLAGS += -DANDROID_SMP=0 + else + $(error TARGET_CPU_SMP must be (true|false), found $(TARGET_CPU_SMP)) + endif endif ART_TARGET_CFLAGS += $(ART_DEFAULT_GC_TYPE_CFLAGS) |