diff options
| author | 2015-07-30 08:57:50 -0700 | |
|---|---|---|
| committer | 2015-07-30 08:57:50 -0700 | |
| commit | c60e1b755c5632dfeb04c333489ede52ee5c945f (patch) | |
| tree | 9582a0ffc99e4ad11dcd5d95dd97b09bc6acc5bf /runtime/gc/allocator/rosalloc.cc | |
| parent | 7b926cdacc2b67241bc9cb5f2d4b04b13ca79d0e (diff) | |
ART: Use __ANDROID__ instead of HAVE_ANDROID_OS
Use the proper define.
Change-Id: I71e291ac25f5d5f0187ac9b6ef2d6872f19e6085
Diffstat (limited to 'runtime/gc/allocator/rosalloc.cc')
| -rw-r--r-- | runtime/gc/allocator/rosalloc.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/gc/allocator/rosalloc.cc b/runtime/gc/allocator/rosalloc.cc index abaa97f2db..470bc1cb22 100644 --- a/runtime/gc/allocator/rosalloc.cc +++ b/runtime/gc/allocator/rosalloc.cc @@ -1170,7 +1170,7 @@ size_t RosAlloc::BulkFree(Thread* self, void** ptrs, size_t num_ptrs) { // First mark slots to free in the bulk free bit map without locking the // size bracket locks. On host, unordered_set is faster than vector + flag. -#ifdef HAVE_ANDROID_OS +#ifdef __ANDROID__ std::vector<Run*> runs; #else std::unordered_set<Run*, hash_run, eq_run> runs; @@ -1237,7 +1237,7 @@ size_t RosAlloc::BulkFree(Thread* self, void** ptrs, size_t num_ptrs) { DCHECK_EQ(run->magic_num_, kMagicNum); // Set the bit in the bulk free bit map. freed_bytes += run->MarkBulkFreeBitMap(ptr); -#ifdef HAVE_ANDROID_OS +#ifdef __ANDROID__ if (!run->to_be_bulk_freed_) { run->to_be_bulk_freed_ = true; runs.push_back(run); @@ -1252,7 +1252,7 @@ size_t RosAlloc::BulkFree(Thread* self, void** ptrs, size_t num_ptrs) { // union the bulk free bit map into the thread-local free bit map // (for thread-local runs.) for (Run* run : runs) { -#ifdef HAVE_ANDROID_OS +#ifdef __ANDROID__ DCHECK(run->to_be_bulk_freed_); run->to_be_bulk_freed_ = false; #endif |