diff options
| author | Narayan Kamath <narayan@google.com> | 2014-04-23 20:24:57 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-05-01 11:25:07 +0100 |
| commit | 11d9f06a96a6909905c248ed684366190140095c (patch) | |
| tree | 27b02ab216b98ba1656d66072fd46c5adec61242 /runtime/gc/heap.h | |
| parent | b3016551e5f264264dbb633a1ddf03ac97f9c66c (diff) | |
| download | art-11d9f06a96a6909905c248ed684366190140095c.zip art-11d9f06a96a6909905c248ed684366190140095c.tar.gz art-11d9f06a96a6909905c248ed684366190140095c.tar.bz2 | |
Use instruction specific dalvik cache dirs.
- All oat & art files are now placed under /data/dalvik-cache/<isa>/.
- GetDalvikCacheOrDie now requires a mandatory subdirectory argument,
and is implicitly rooted under /data/.
- Added helper methods to convert InstructionSet enums into strings
and vice versa.
(cherry picked from commit 2974bc3d8a5d161d449dd66826d668d87bdc3cbe)
Change-Id: Ic7986938e6a7091a2af675ebafec768f7b5fb8cd
Diffstat (limited to 'runtime/gc/heap.h')
| -rw-r--r-- | runtime/gc/heap.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/gc/heap.h b/runtime/gc/heap.h index c631372..5533f3d 100644 --- a/runtime/gc/heap.h +++ b/runtime/gc/heap.h @@ -31,6 +31,7 @@ #include "gc/collector_type.h" #include "globals.h" #include "gtest/gtest.h" +#include "instruction_set.h" #include "jni.h" #include "object_callbacks.h" #include "offsets.h" @@ -140,6 +141,7 @@ class Heap { size_t max_free, double target_utilization, double foreground_heap_growth_multiplier, size_t capacity, const std::string& original_image_file_name, + const InstructionSet image_instruction_set, CollectorType foreground_collector_type, CollectorType background_collector_type, size_t parallel_gc_threads, size_t conc_gc_threads, bool low_memory_mode, size_t long_pause_threshold, size_t long_gc_threshold, |