Move inputservice over to frameworks/native
Remove all of the pieces except the PointerController and SpriteController over
to frameworks/native in preparation for inputflinger. Those two need to stay in
frameworks/base for now because they depend on Skia currently. In the long run
they should be merged into either the InputManager or the WindowManager rather
than as a part of the inputservice / inputflinger.
Try 2.
Change-Id: I84259356d3eb8efc5aefb9d6b311b5fc590ea3ed
diff --git a/libs/input/Android.mk b/libs/input/Android.mk
index eb2bebe..6011ff0 100644
--- a/libs/input/Android.mk
+++ b/libs/input/Android.mk
@@ -17,30 +17,23 @@
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \
- EventHub.cpp \
- InputApplication.cpp \
- InputDispatcher.cpp \
- InputListener.cpp \
- InputManager.cpp \
- InputReader.cpp \
- InputWindow.cpp \
PointerController.cpp \
SpriteController.cpp
LOCAL_SHARED_LIBRARIES := \
libcutils \
liblog \
- libandroidfw \
libutils \
- libhardware \
- libhardware_legacy \
libskia \
libgui \
libui \
- libinput
+ libinput \
+ libinputflinger
LOCAL_C_INCLUDES := \
- external/skia/include/core
+ external/skia/include/core \
+ frameworks/native/services
+
LOCAL_CFLAGS += -Wno-unused-parameter