commit 7bd6d17a3c2d61e9ed118e6d95ebc9b43c481fc6
author Josh Gao <jmgao@google.com> Wed Aug 02 23:30:27 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 02 23:30:27 2017 +0000
tree 109b397ce45816177345fa0445dcacef79830ea7
parent 464fde4e1ac50cf5f6d7c850e29332a5c8be5581
parent dc4193b0ad5f312cc67983fe5febbc3ccd6c56b7

Merge "base: work around thread safety analysis bug." am: f3c7f10abd am: f727a3933e
am: 14c7e22a50

Change-Id: I8f9c6e581ad967280dd44cabdd0aa31866e1ace9

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 fbb5923..65eb015 100644
--- a/base/include/android-base/thread_annotations.h
+++ b/base/include/android-base/thread_annotations.h
@@ -71,11 +71,12 @@
 #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_capability(x))
+      THREAD_ANNOTATION_ATTRIBUTE__(assert_lock(x))
 
 #define ASSERT_SHARED_CAPABILITY(x) \
-      THREAD_ANNOTATION_ATTRIBUTE__(assert_shared_capability(x))
+      THREAD_ANNOTATION_ATTRIBUTE__(assert_shared_lock(x))
 
 #define RETURN_CAPABILITY(x) \
       THREAD_ANNOTATION_ATTRIBUTE__(lock_returned(x))