← Back to branch summary

~mir-team/mir/in-process-egl+input-conglomeration

« back to all changes in this revision

Viewing changes to 3rd_party/android-input/android/frameworks/native/include/utils/RWLock.h

Merged trunk and fixed issues

Show diffs side-by-side

added added

removed removed

Lines of Context:
3rd_party/android-input/android/frameworks/native/include/utils/RWLock.h
24
24
# include <pthread.h>
25
25
#endif
26
26
 
27
 
#include ANDROIDFW_UTILS(Errors.h)
28
 
#include ANDROIDFW_UTILS(ThreadDefs.h)
 
27
#include <std/Errors.h>
 
28
#include <std/ThreadDefs.h>
29
29
 
30
30
// ---------------------------------------------------------------------------
31
31
namespace android {