← 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/private/utils/Static.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/private/utils/Static.h
17
17
// All static variables go here, to control initialization and
18
18
// destruction order in the library.
19
19
 
20
 
#include <androidfw/Platform.h>
21
20
 
22
 
#include ANDROIDFW_UTILS(threads.h)
23
 
#include ANDROIDFW_UTILS(Vector.h)
 
21
#include <std/threads.h>
 
22
#include <std/Vector.h>
24
23
 
25
24
namespace android {
26
25
// For TextStream.cpp