← 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/base/include/androidfw/InputTransport.h

Merged trunk and fixed issues

Show diffs side-by-side

added added

removed removed

Lines of Context:
3rd_party/android-input/android/frameworks/base/include/androidfw/InputTransport.h
17
17
#ifndef _ANDROIDFW_INPUT_TRANSPORT_H
18
18
#define _ANDROIDFW_INPUT_TRANSPORT_H
19
19
 
20
 
#include <androidfw/Platform.h>
21
20
 
22
21
/**
23
22
 * Native input transport.
30
29
 */
31
30
 
32
31
#include <androidfw/Input.h>
33
 
#include ANDROIDFW_UTILS(Errors.h)
34
 
#include ANDROIDFW_UTILS(Timers.h)
35
 
#include ANDROIDFW_UTILS(RefBase.h)
36
 
#include ANDROIDFW_UTILS(String8.h)
37
 
#include ANDROIDFW_UTILS(Vector.h)
38
 
#include ANDROIDFW_UTILS(BitSet.h)
 
32
#include <std/Errors.h>
 
33
#include <std/Timers.h>
 
34
#include <std/RefBase.h>
 
35
#include <std/String8.h>
 
36
#include <std/Vector.h>
 
37
#include <std/BitSet.h>
39
38
 
40
39
namespace android {
41
40