summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nick Kralevich <nnk@google.com> 2013-05-21 15:04:14 -0700
committer Nick Kralevich <nnk@google.com> 2013-05-21 15:04:14 -0700
commit631500ef58e016943bd73521d113f12eab16dc25 (patch)
treea34410053cdfdf5f61d900a5f6f1b4deedd3d276
parent7f43674db314ab76e77cfd2a9488058eae144aa8 (diff)
Move VelocityTracker.cpp to target build only
VelocityTracker.cpp makes reference to property_get, which doesn't make a lot of sense when compiling for the host. Compile this file for the target only. Keyboard.cpp: Remove unnecessary include file. Change-Id: Iee9edd81953b2e7e815005770ce286a6ec586f20
-rw-r--r--libs/androidfw/Android.mk4
-rw-r--r--libs/androidfw/Keyboard.cpp1
2 files changed, 2 insertions, 3 deletions
diff --git a/libs/androidfw/Android.mk b/libs/androidfw/Android.mk
index bb79f27f4ac1..c06b14436728 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 4ddbeab340ee..26a4e6a412a2 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 {