From 719d1a33f6569864f529e5a3fff59e7bca97aad0 Mon Sep 17 00:00:00 2001 From: Ian Rogers 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/transaction.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'runtime/transaction.h') diff --git a/runtime/transaction.h b/runtime/transaction.h index 68f9540..cf696de 100644 --- a/runtime/transaction.h +++ b/runtime/transaction.h @@ -19,10 +19,9 @@ #include "base/macros.h" #include "base/mutex.h" -#include "locks.h" +#include "object_callbacks.h" #include "offsets.h" #include "primitive.h" -#include "object_callbacks.h" #include "safe_map.h" #include -- cgit v1.1