diff options
| author | Josh Gao <jmgao@google.com> | 2017-08-02 23:10:26 +0000 |
|---|---|---|
| committer | Josh Gao <jmgao@google.com> | 2017-08-02 23:10:26 +0000 |
| commit | c54e3dba8dabba0544f9ab80a38574e15052c70c (patch) | |
| tree | 0a10b2d5700877d71a6977bb0f63384f0ceb5021 /base/include/android-base | |
| parent | e4509da961057b94bc42e71d8dcd948cae261ba8 (diff) | |
| download | system_core-c54e3dba8dabba0544f9ab80a38574e15052c70c.tar.gz system_core-c54e3dba8dabba0544f9ab80a38574e15052c70c.tar.bz2 system_core-c54e3dba8dabba0544f9ab80a38574e15052c70c.zip | |
Revert "base: work around thread safety analysis bug."
This reverts commit e4509da961057b94bc42e71d8dcd948cae261ba8.
Reason for revert: probably breaks checkbuild?
Change-Id: I04a6284dee82761c90fa355da0472855a228b849
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 @@ #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_lock(x)) + THREAD_ANNOTATION_ATTRIBUTE__(assert_capability(x)) #define ASSERT_SHARED_CAPABILITY(x) \ - THREAD_ANNOTATION_ATTRIBUTE__(assert_shared_lock(x)) + THREAD_ANNOTATION_ATTRIBUTE__(assert_shared_capability(x)) #define RETURN_CAPABILITY(x) \ THREAD_ANNOTATION_ATTRIBUTE__(lock_returned(x)) |