diff options
| author | Nick Kralevich <nnk@google.com> | 2013-05-23 15:40:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-23 15:40:11 +0000 |
| commit | db90a330ba6c8df653f311a34e0288c5cdeade3f (patch) | |
| tree | 8f89779cda1935eddcf12b3b561226d3e5447d7b /libs | |
| parent | f17771f2a55b566ebeabe247e8ec39c987e74244 (diff) | |
| parent | 631500ef58e016943bd73521d113f12eab16dc25 (diff) | |
| download | frameworks_base-db90a330ba6c8df653f311a34e0288c5cdeade3f.zip frameworks_base-db90a330ba6c8df653f311a34e0288c5cdeade3f.tar.gz frameworks_base-db90a330ba6c8df653f311a34e0288c5cdeade3f.tar.bz2 | |
Merge "Move VelocityTracker.cpp to target build only"
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/androidfw/Android.mk | 4 | ||||
| -rw-r--r-- | libs/androidfw/Keyboard.cpp | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/libs/androidfw/Android.mk b/libs/androidfw/Android.mk index bb79f27..c06b144 100644 --- a/libs/androidfw/Android.mk +++ b/libs/androidfw/Android.mk @@ -38,7 +38,6 @@ commonUiSources:= \ KeyCharacterMap.cpp \ KeyLayoutMap.cpp \ VelocityControl.cpp \ - VelocityTracker.cpp \ VirtualKeyMap.cpp commonSources:= \ @@ -74,7 +73,8 @@ LOCAL_SRC_FILES:= \ BackupData.cpp \ BackupHelpers.cpp \ CursorWindow.cpp \ - InputTransport.cpp + InputTransport.cpp \ + VelocityTracker.cpp LOCAL_SHARED_LIBRARIES := \ liblog \ diff --git a/libs/androidfw/Keyboard.cpp b/libs/androidfw/Keyboard.cpp index 4ddbeab..26a4e6a 100644 --- a/libs/androidfw/Keyboard.cpp +++ b/libs/androidfw/Keyboard.cpp @@ -27,7 +27,6 @@ #include <androidfw/InputDevice.h> #include <utils/Errors.h> #include <utils/Log.h> -#include <cutils/properties.h> namespace android { |