commit efe00c185566162db09d16a339d341978e771c10
author Josh Gao <jmgao@google.com> Wed Aug 02 23:10:26 2017 +0000
committer Josh Gao <jmgao@google.com> Wed Aug 02 23:10:26 2017 +0000
tree 0a10b2d5700877d71a6977bb0f63384f0ceb5021
parent 3dc9358831fc7b02601ce02887e880c2caae3457

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

This reverts commit e4509da961057b94bc42e71d8dcd948cae261ba8.

Reason for revert: probably breaks checkbuild?

Change-Id: I04a6284dee82761c90fa355da0472855a228b849

base/include/android-base/thread_annotations.h

diff --git a/base/include/android-base/thread_annotations.h b/base/include/android-base/thread_annotations.h
index 65eb015..fbb5923 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))