Merge "base: work around thread safety analysis bug."

am: f3c7f10abd

Change-Id: Ied41fa3a6724c7835ce8636301e1e30c23e1d660
This commit is contained in:
Josh Gao 2017-08-02 23:16:29 +00:00 committed by android-build-merger
commit f727a3933e

View file

@ -71,11 +71,12 @@
#define EXCLUDES(...) \
THREAD_ANNOTATION_ATTRIBUTE__(locks_excluded(__VA_ARGS__))
// b/64226736: assert_capability and assert_shared_capability are non-functional.
#define ASSERT_CAPABILITY(x) \
THREAD_ANNOTATION_ATTRIBUTE__(assert_capability(x))
THREAD_ANNOTATION_ATTRIBUTE__(assert_lock(x))
#define ASSERT_SHARED_CAPABILITY(x) \
THREAD_ANNOTATION_ATTRIBUTE__(assert_shared_capability(x))
THREAD_ANNOTATION_ATTRIBUTE__(assert_shared_lock(x))
#define RETURN_CAPABILITY(x) \
THREAD_ANNOTATION_ATTRIBUTE__(lock_returned(x))