diff options
| author | Ian Rogers <irogers@google.com> | 2014-03-06 12:13:39 -0800 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-03-06 19:16:01 -0800 |
| commit | 719d1a33f6569864f529e5a3fff59e7bca97aad0 (patch) | |
| tree | fcd84efd7b9806b93ec1a44e2317e6f882e7fe0e /runtime/gc/collector/garbage_collector.h | |
| parent | 5365eea9940269b662cfbe103caa348816ff1558 (diff) | |
| download | art-719d1a33f6569864f529e5a3fff59e7bca97aad0.zip art-719d1a33f6569864f529e5a3fff59e7bca97aad0.tar.gz art-719d1a33f6569864f529e5a3fff59e7bca97aad0.tar.bz2 | |
Enable annotalysis on clang ART builds.
Fix clang build errors aswell as restructure locking/mutex code for correct
thread safety analysis support.
Reorder make dependencies so that host builds build first as they should
provide better compilation errors than target.
Remove host's use of -fno-omit-frame-pointer as it has no value with correct
use of CFI, which we should have.
Change-Id: I72cea8da9a3757b1a0b3acb4081feccb7c6cef90
Diffstat (limited to 'runtime/gc/collector/garbage_collector.h')
| -rw-r--r-- | runtime/gc/collector/garbage_collector.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/gc/collector/garbage_collector.h b/runtime/gc/collector/garbage_collector.h index 088f1d4..8d401b8 100644 --- a/runtime/gc/collector/garbage_collector.h +++ b/runtime/gc/collector/garbage_collector.h @@ -18,10 +18,10 @@ #define ART_RUNTIME_GC_COLLECTOR_GARBAGE_COLLECTOR_H_ #include "base/histogram.h" +#include "base/mutex.h" #include "base/timing_logger.h" #include "gc/gc_cause.h" #include "gc_type.h" -#include "locks.h" #include <stdint.h> #include <vector> |