summaryrefslogtreecommitdiffstats
path: root/runtime/Android.mk
diff options
context:
space:
mode:
authorMathieu Chartier <mathieuc@google.com>2015-02-18 14:33:14 -0800
committerMathieu Chartier <mathieuc@google.com>2015-02-19 09:59:50 -0800
commitb666f4805c8ae707ea6fd7f6c7f375e0b000dba8 (patch)
treea61439a9bcb555dc575286f3e0bb5e50ce185982 /runtime/Android.mk
parent39109a06015c91188232e59fa9e60e0915d24cd7 (diff)
downloadart-b666f4805c8ae707ea6fd7f6c7f375e0b000dba8.tar.gz
art-b666f4805c8ae707ea6fd7f6c7f375e0b000dba8.tar.bz2
art-b666f4805c8ae707ea6fd7f6c7f375e0b000dba8.zip
Move arenas into runtime
Moved arena pool into the runtime. Motivation: Allow GC to use arena allocators, recycle arena pool for linear alloc. Bug: 19264997 Change-Id: I8ddbb6d55ee923a980b28fb656c758c5d7697c2f
Diffstat (limited to 'runtime/Android.mk')
-rw-r--r--runtime/Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/Android.mk b/runtime/Android.mk
index 4714610da4..c647cc2a3e 100644
--- a/runtime/Android.mk
+++ b/runtime/Android.mk
@@ -22,10 +22,12 @@ LIBART_COMMON_SRC_FILES := \
atomic.cc.arm \
barrier.cc \
base/allocator.cc \
+ base/arena_allocator.cc \
base/bit_vector.cc \
base/hex_dump.cc \
base/logging.cc \
base/mutex.cc \
+ base/scoped_arena_allocator.cc \
base/scoped_flock.cc \
base/stringpiece.cc \
base/stringprintf.cc \