From 5820852c0f0fe634a104f81691ad3e0026caecdc Mon Sep 17 00:00:00 2001 From: Brett Chabot Date: Wed, 9 Sep 2020 13:55:24 -0700 Subject: Build all of libinput for linux host. Including enabling parcel-related code in source already building for host. Test: m libandroid_runtime Change-Id: Ia569e5158ba6ead28486069036f6a3595662bbf8 --- libs/input/Input.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'libs/input/Input.cpp') diff --git a/libs/input/Input.cpp b/libs/input/Input.cpp index fb2f186984..f3b8832a8f 100644 --- a/libs/input/Input.cpp +++ b/libs/input/Input.cpp @@ -26,8 +26,8 @@ #include #include -#ifdef __ANDROID__ #include +#ifdef __ANDROID__ #include #endif @@ -250,7 +250,6 @@ void PointerCoords::applyOffset(float xOffset, float yOffset) { setAxisValue(AMOTION_EVENT_AXIS_Y, getY() + yOffset); } -#ifdef __ANDROID__ status_t PointerCoords::readFromParcel(Parcel* parcel) { bits = parcel->readInt64(); @@ -274,7 +273,6 @@ status_t PointerCoords::writeToParcel(Parcel* parcel) const { } return OK; } -#endif void PointerCoords::tooManyAxes(int axis) { ALOGW("Could not set value for axis %d because the PointerCoords structure is full and " @@ -536,7 +534,6 @@ void MotionEvent::transform(const std::array& matrix) { } } -#ifdef __ANDROID__ static status_t readFromParcel(ui::Transform& transform, const Parcel& parcel) { float dsdx, dtdx, tx, dtdy, dsdy, ty; status_t status = parcel.readFloat(&dsdx); @@ -673,7 +670,6 @@ status_t MotionEvent::writeToParcel(Parcel* parcel) const { } return OK; } -#endif bool MotionEvent::isTouchEvent(uint32_t source, int32_t action) { if (source & AINPUT_SOURCE_CLASS_POINTER) { -- cgit v1.2.3-59-g8ed1b