diff options
| author | 2014-03-06 12:13:39 -0800 | |
|---|---|---|
| committer | 2014-03-06 19:16:01 -0800 | |
| commit | 719d1a33f6569864f529e5a3fff59e7bca97aad0 (patch) | |
| tree | fcd84efd7b9806b93ec1a44e2317e6f882e7fe0e /runtime/class_linker.h | |
| parent | 5365eea9940269b662cfbe103caa348816ff1558 (diff) | |
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/class_linker.h')
| -rw-r--r-- | runtime/class_linker.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/class_linker.h b/runtime/class_linker.h index aad7cfc875..701e62e57a 100644 --- a/runtime/class_linker.h +++ b/runtime/class_linker.h @@ -260,7 +260,7 @@ class ClassLinker { bool GenerateOatFile(const char* dex_filename, int oat_fd, const char* oat_cache_filename, - std::string* error_msg); + std::string* error_msg) LOCKS_EXCLUDED(Locks::mutator_lock_); const OatFile* FindOatFileFromOatLocation(const std::string& location, @@ -519,7 +519,7 @@ class ClassLinker { SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); const OatFile* FindOpenedOatFileFromDexLocation(const char* dex_location, const uint32_t* const dex_location_checksum) - LOCKS_EXCLUDED(dex_lock); + LOCKS_EXCLUDED(dex_lock_); const OatFile* FindOpenedOatFileFromOatLocation(const std::string& oat_location) LOCKS_EXCLUDED(dex_lock_); const DexFile* FindDexFileInOatLocation(const char* dex_location, |