diff options
author | Ian Rogers <irogers@google.com> | 2014-05-15 11:43:06 -0700 |
---|---|---|
committer | Ian Rogers <irogers@google.com> | 2014-05-15 11:43:06 -0700 |
commit | 5fcfa7d9d97246f7eb48a74356cb00ec2cbc0181 (patch) | |
tree | 6518529391c29cd21d38befd5dcc12922f194ede /build/Android.common.mk | |
parent | 30b65201aa9c953433dbde1288e9b1b883042cd1 (diff) | |
download | art-5fcfa7d9d97246f7eb48a74356cb00ec2cbc0181.zip art-5fcfa7d9d97246f7eb48a74356cb00ec2cbc0181.tar.gz art-5fcfa7d9d97246f7eb48a74356cb00ec2cbc0181.tar.bz2 |
Move RoS allocator to use unordered_set.
Work-around existing stlport issues for the target. This will go away when the
target is using libc++.
Change-Id: I8f213ecd9dc7d93d17f4a0d7e84182c12af6ca1b
Diffstat (limited to 'build/Android.common.mk')
-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 188ddb5..74f8d8d 100644 --- a/build/Android.common.mk +++ b/build/Android.common.mk @@ -253,6 +253,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),) |