diff options
| author | Jeff Brown <jeffbrown@google.com> | 2013-07-01 19:07:15 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2013-07-01 20:11:42 -0700 |
| commit | 9d3b1a424c5c61e24e9659d15fb353026a00d925 (patch) | |
| tree | 0e543391e3ac7b6ac0bff377e08cd2e233ef7363 /native | |
| parent | 8f5e3d13e166e4873e130a5ef7c987333dbac917 (diff) | |
| download | frameworks_base-9d3b1a424c5c61e24e9659d15fb353026a00d925.zip frameworks_base-9d3b1a424c5c61e24e9659d15fb353026a00d925.tar.gz frameworks_base-9d3b1a424c5c61e24e9659d15fb353026a00d925.tar.bz2 | |
Move input library code to frameworks/native.
No longer compile libandroidfw as a static library on the device
since it already exists as a shared library. Keeping the static
library would force us to provide a static library version of
libinput for the device as well which doesn't make sense.
Change-Id: I3517881b87b47dcc209d80dbd0ac6b5cf29a766f
Diffstat (limited to 'native')
| -rw-r--r-- | native/android/Android.mk | 1 | ||||
| -rw-r--r-- | native/android/input.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/native/android/Android.mk b/native/android/Android.mk index 207cc4b..cda38e0 100644 --- a/native/android/Android.mk +++ b/native/android/Android.mk @@ -20,6 +20,7 @@ LOCAL_SHARED_LIBRARIES := \ liblog \ libcutils \ libandroidfw \ + libinput \ libutils \ libbinder \ libui \ diff --git a/native/android/input.cpp b/native/android/input.cpp index f6ea576..e9d08b4 100644 --- a/native/android/input.cpp +++ b/native/android/input.cpp @@ -18,8 +18,8 @@ #include <utils/Log.h> #include <android/input.h> -#include <androidfw/Input.h> -#include <androidfw/InputTransport.h> +#include <input/Input.h> +#include <input/InputTransport.h> #include <utils/Looper.h> #include <utils/RefBase.h> #include <utils/Vector.h> |