ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: 9560524455

Change-Id: I37dc94c066c1527c10488e48c713c29b4e211cfb
This commit is contained in:
Josh Gao 2017-08-02 23:59:32 +00:00 • committed by android-build-merger
commit 9e4fb9a117
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))