Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76c07a5c authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Move input library code to frameworks/native."

parents e722873a 9d3b1a42

core/jni/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ LOCAL_SHARED_LIBRARIES := \ 
	libnetutils \

	libui \

	libgui \

	libinput \

	libcamera_client \

	libskia \

	libsqlite \

core/jni/android_app_NativeActivity.cpp

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <android_runtime/android_util_AssetManager.h>

#include <android_runtime/android_view_Surface.h>

#include <android_runtime/AndroidRuntime.h>

#include <androidfw/InputTransport.h>

#include <input/InputTransport.h>



#include <gui/Surface.h>

core/jni/android_view_InputChannel.cpp

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <android_runtime/AndroidRuntime.h>

#include <binder/Parcel.h>

#include <utils/Log.h>

#include <androidfw/InputTransport.h>

#include <input/InputTransport.h>

#include "android_view_InputChannel.h"

#include "android_os_Parcel.h"

#include "android_util_Binder.h"

core/jni/android_view_InputChannel.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


#include "jni.h"



#include <androidfw/InputTransport.h>

#include <input/InputTransport.h>



namespace android {

core/jni/android_view_InputDevice.cpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#include <androidfw/Input.h>

#include <input/Input.h>



#include <android_runtime/AndroidRuntime.h>

#include <nativehelper/jni.h>