diff options
| author | Ian Rogers <irogers@google.com> | 2014-05-15 21:33:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-15 21:33:42 +0000 |
| commit | 3b2bcbf9daf39f4cece7fde1186f3fa494000ed9 (patch) | |
| tree | d162f6dc331c9c4c5d2e0222624eac98b02039b1 /build | |
| parent | 0e78ff7ee6b4dadb9c10b4b1ba2860ccbcaf22bd (diff) | |
| parent | 5fcfa7d9d97246f7eb48a74356cb00ec2cbc0181 (diff) | |
| download | art-3b2bcbf9daf39f4cece7fde1186f3fa494000ed9.tar.gz art-3b2bcbf9daf39f4cece7fde1186f3fa494000ed9.tar.bz2 art-3b2bcbf9daf39f4cece7fde1186f3fa494000ed9.zip | |
Merge "Move RoS allocator to use unordered_set."
Diffstat (limited to 'build')
| -rw-r--r-- | build/Android.common.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/build/Android.common.mk b/build/Android.common.mk index 75d360c4c3..c1085587b6 100644 --- a/build/Android.common.mk +++ b/build/Android.common.mk @@ -259,6 +259,9 @@ else endif ART_TARGET_CFLAGS += $(ART_DEFAULT_GC_TYPE_CFLAGS) +# TODO: remove when target no longer implies stlport. +ART_TARGET_CFLAGS += -DART_WITH_STLPORT=1 + # DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES is set in ../build/core/dex_preopt.mk based on # the TARGET_CPU_VARIANT ifeq ($(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES),) |