openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

am: b5c90e9d6b

Change-Id: Ieda68e652c9784990dd7d03c4101b5a9ed18d98a
This commit is contained in:
Josh Gao 2017-08-02 23:32:58 +00:00 committed by android-build-merger
parent f727a3933e b5c90e9d6b
commit 9560524455
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
base/include/android-base/thread_annotations.h
View File

@ -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))