diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-06-13 19:16:55 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2010-06-13 19:16:55 -0700 |
| commit | 8e03b7566c42621fda01186b66b019142eb84fbf (patch) | |
| tree | 17c45ea04288d2d57053ea740ae1cf332a4308c8 /core/jni/Android.mk | |
| parent | 5ddd127d5a38d80c0d8087d1770f41f61f84f048 (diff) | |
| parent | 9e660c8201ab9aeead5d78a75c2bbfecc374858f (diff) | |
| download | frameworks_base-8e03b7566c42621fda01186b66b019142eb84fbf.zip frameworks_base-8e03b7566c42621fda01186b66b019142eb84fbf.tar.gz frameworks_base-8e03b7566c42621fda01186b66b019142eb84fbf.tar.bz2 | |
resolved conflicts for merge of 9e660c82 to master
Change-Id: Ic4bd85cbaa5b9a10dcb474a0dad46490bf967e43
Diffstat (limited to 'core/jni/Android.mk')
| -rw-r--r-- | core/jni/Android.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 30e9a6a..86ee9b4 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -44,6 +44,11 @@ LOCAL_SRC_FILES:= \ android_view_Display.cpp \ android_view_Surface.cpp \ android_view_ViewRoot.cpp \ + android_view_InputChannel.cpp \ + android_view_InputQueue.cpp \ + android_view_InputTarget.cpp \ + android_view_KeyEvent.cpp \ + android_view_MotionEvent.cpp \ android_text_AndroidCharacter.cpp \ android_text_AndroidBidi.cpp \ android_text_KeyCharacterMap.cpp \ |