Fix libinput mac build, hopefully.
Restore the ifdefs removed in go/ag/12549959, but using
ifdef __linux__ instead of __ANDROID__.
Test: m libinput
Bug: 172023026
Change-Id: Iafbf592e7b937b780e5ffc2df490a6c17f5f6cf5
diff --git a/libs/input/Input.cpp b/libs/input/Input.cpp
index ad7db75..0ea3889 100644
--- a/libs/input/Input.cpp
+++ b/libs/input/Input.cpp
@@ -28,7 +28,9 @@
#include <input/InputDevice.h>
#include <input/InputEventLabels.h>
+#ifdef __linux__
#include <binder/Parcel.h>
+#endif
#ifdef __ANDROID__
#include <sys/random.h>
#endif
@@ -254,6 +256,7 @@
setAxisValue(AMOTION_EVENT_AXIS_Y, getY() + yOffset);
}
+#ifdef __linux__
status_t PointerCoords::readFromParcel(Parcel* parcel) {
bits = parcel->readInt64();
@@ -277,6 +280,7 @@
}
return OK;
}
+#endif
void PointerCoords::tooManyAxes(int axis) {
ALOGW("Could not set value for axis %d because the PointerCoords structure is full and "
@@ -538,6 +542,7 @@
}
}
+#ifdef __linux__
static status_t readFromParcel(ui::Transform& transform, const Parcel& parcel) {
float dsdx, dtdx, tx, dtdy, dsdy, ty;
status_t status = parcel.readFloat(&dsdx);
@@ -674,6 +679,7 @@
}
return OK;
}
+#endif
bool MotionEvent::isTouchEvent(uint32_t source, int32_t action) {
if (source & AINPUT_SOURCE_CLASS_POINTER) {
diff --git a/libs/input/KeyCharacterMap.cpp b/libs/input/KeyCharacterMap.cpp
index 2623ecd..d5457ea 100644
--- a/libs/input/KeyCharacterMap.cpp
+++ b/libs/input/KeyCharacterMap.cpp
@@ -19,7 +19,9 @@
#include <stdlib.h>
#include <string.h>
+#ifdef __linux__
#include <binder/Parcel.h>
+#endif
#include <android/keycodes.h>
#include <attestation/HmacKeyManager.h>
#include <input/InputEventLabels.h>
@@ -587,6 +589,7 @@
}
}
+#ifdef __linux__
std::shared_ptr<KeyCharacterMap> KeyCharacterMap::readFromParcel(Parcel* parcel) {
if (parcel == nullptr) {
ALOGE("%s: Null parcel", __func__);
@@ -672,7 +675,7 @@
parcel->writeInt32(0);
}
}
-
+#endif // __linux__
// --- KeyCharacterMap::Key ---