From 719d1a33f6569864f529e5a3fff59e7bca97aad0 Mon Sep 17 00:00:00 2001
From: Ian Rogers <irogers@google.com>
Date: Thu, 6 Mar 2014 12:13:39 -0800
Subject: 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
---
 runtime/intern_table.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'runtime/intern_table.h')

diff --git a/runtime/intern_table.h b/runtime/intern_table.h
index fd921f3..7dd06c6 100644
--- a/runtime/intern_table.h
+++ b/runtime/intern_table.h
@@ -17,12 +17,11 @@
 #ifndef ART_RUNTIME_INTERN_TABLE_H_
 #define ART_RUNTIME_INTERN_TABLE_H_
 
+#include <map>
+
 #include "base/mutex.h"
-#include "locks.h"
 #include "object_callbacks.h"
 
-#include <map>
-
 namespace art {
 
 enum VisitRootFlags : uint8_t;
-- 
cgit v1.1