diff options
Diffstat (limited to 'base/include/android-base')
-rw-r--r-- | base/include/android-base/thread_annotations.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/base/include/android-base/thread_annotations.h b/base/include/android-base/thread_annotations.h index 65eb015c3..fbb592336 100644 --- a/base/include/android-base/thread_annotations.h +++ b/base/include/android-base/thread_annotations.h | |||
@@ -71,12 +71,11 @@ | |||
71 | #define EXCLUDES(...) \ | 71 | #define EXCLUDES(...) \ |
72 | THREAD_ANNOTATION_ATTRIBUTE__(locks_excluded(__VA_ARGS__)) | 72 | THREAD_ANNOTATION_ATTRIBUTE__(locks_excluded(__VA_ARGS__)) |
73 | 73 | ||
74 | // b/64226736: assert_capability and assert_shared_capability are non-functional. | ||
75 | #define ASSERT_CAPABILITY(x) \ | 74 | #define ASSERT_CAPABILITY(x) \ |
76 | THREAD_ANNOTATION_ATTRIBUTE__(assert_lock(x)) | 75 | THREAD_ANNOTATION_ATTRIBUTE__(assert_capability(x)) |
77 | 76 | ||
78 | #define ASSERT_SHARED_CAPABILITY(x) \ | 77 | #define ASSERT_SHARED_CAPABILITY(x) \ |
79 | THREAD_ANNOTATION_ATTRIBUTE__(assert_shared_lock(x)) | 78 | THREAD_ANNOTATION_ATTRIBUTE__(assert_shared_capability(x)) |
80 | 79 | ||
81 | #define RETURN_CAPABILITY(x) \ | 80 | #define RETURN_CAPABILITY(x) \ |
82 | THREAD_ANNOTATION_ATTRIBUTE__(lock_returned(x)) | 81 | THREAD_ANNOTATION_ATTRIBUTE__(lock_returned(x)) |