diff options
| author | Ian Rogers <irogers@google.com> | 2014-03-13 09:02:55 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-03-13 09:12:20 -0700 |
| commit | 9758f79a6c1ef7f662caca9c1df39de1934166b8 (patch) | |
| tree | fdffb18605692c990665f3e99a17dcb0efb09893 /compiler/compilers.cc | |
| parent | c1020433660737d466b0d726bbeb86d9a279a44a (diff) | |
| download | art-9758f79a6c1ef7f662caca9c1df39de1934166b8.zip art-9758f79a6c1ef7f662caca9c1df39de1934166b8.tar.gz art-9758f79a6c1ef7f662caca9c1df39de1934166b8.tar.bz2 | |
Implement FINAL/OVERRIDE for clang.
Separate declaration from definition in certain places to work-around issues
with clang.
Remove bogus lock annotation at definition in compilers.cc that is already
present at the declaration.
Remove duplicate definition of ClassReference.
Change-Id: I5368057bb36319a259110b2198610d9d2b2e5041
Diffstat (limited to 'compiler/compilers.cc')
| -rw-r--r-- | compiler/compilers.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/compilers.cc b/compiler/compilers.cc index 9bb1719..f58b38b 100644 --- a/compiler/compilers.cc +++ b/compiler/compilers.cc @@ -91,8 +91,7 @@ bool QuickCompiler::WriteElf(art::File* file, OatWriter* oat_writer, const std::vector<const art::DexFile*>& dex_files, const std::string& android_root, - bool is_host, const CompilerDriver& driver) const - SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { + bool is_host, const CompilerDriver& driver) const { return art::ElfWriterQuick::Create(file, oat_writer, dex_files, android_root, is_host, driver); } |