diff options
author | Josh Gao | 2017-08-02 18:09:07 -0500 |
---|---|---|
committer | Gerrit Code Review | 2017-08-02 18:09:07 -0500 |
commit | f3c7f10abddfce1bfcf2db1a48472a9ebfa3d097 (patch) | |
tree | 1c2d15cbbe93f0b4a1c21150aadadb08c86473ca | |
parent | f914029057ffce26698e8d5d330c7a2aea2b5e61 (diff) | |
parent | e4509da961057b94bc42e71d8dcd948cae261ba8 (diff) | |
download | platform-system-core-f3c7f10abddfce1bfcf2db1a48472a9ebfa3d097.tar.gz platform-system-core-f3c7f10abddfce1bfcf2db1a48472a9ebfa3d097.tar.xz platform-system-core-f3c7f10abddfce1bfcf2db1a48472a9ebfa3d097.zip |
Merge "base: work around thread safety analysis bug."
-rw-r--r-- | base/include/android-base/thread_annotations.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/base/include/android-base/thread_annotations.h b/base/include/android-base/thread_annotations.h index fbb592336..65eb015c3 100644 --- a/base/include/android-base/thread_annotations.h +++ b/base/include/android-base/thread_annotations.h | |||
@@ -71,11 +71,12 @@ | |||
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. | ||
74 | #define ASSERT_CAPABILITY(x) \ | 75 | #define ASSERT_CAPABILITY(x) \ |
75 | THREAD_ANNOTATION_ATTRIBUTE__(assert_capability(x)) | 76 | THREAD_ANNOTATION_ATTRIBUTE__(assert_lock(x)) |
76 | 77 | ||
77 | #define ASSERT_SHARED_CAPABILITY(x) \ | 78 | #define ASSERT_SHARED_CAPABILITY(x) \ |
78 | THREAD_ANNOTATION_ATTRIBUTE__(assert_shared_capability(x)) | 79 | THREAD_ANNOTATION_ATTRIBUTE__(assert_shared_lock(x)) |
79 | 80 | ||
80 | #define RETURN_CAPABILITY(x) \ | 81 | #define RETURN_CAPABILITY(x) \ |
81 | THREAD_ANNOTATION_ATTRIBUTE__(lock_returned(x)) | 82 | THREAD_ANNOTATION_ATTRIBUTE__(lock_returned(x)) |