Merge "Move inputservice over to frameworks/native" (0d148c8b) · Commits · e / os / android_frameworks_base

core/jni/Android.mk

+1 −0

deleted100644 → 0

+0 −33

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#ifndef _ANDROIDFW_POWER_MANAGER_H
		#define _ANDROIDFW_POWER_MANAGER_H


		namespace android {

		enum {
		USER_ACTIVITY_EVENT_OTHER = 0,
		USER_ACTIVITY_EVENT_BUTTON = 1,
		USER_ACTIVITY_EVENT_TOUCH = 2,

		USER_ACTIVITY_EVENT_LAST = USER_ACTIVITY_EVENT_TOUCH, // Last valid event code.
		};

		} // namespace android

		#endif // _ANDROIDFW_POWER_MANAGER_H

+5 −12

Original line number	Diff line number	Diff line
		@@ -17,30 +17,23 @@ LOCAL_PATH:= $(call my-dir)
		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