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
diff --git a/libs/input/Android.bp b/libs/input/Android.bp
index d8c3e6f..fce3000 100644
--- a/libs/input/Android.bp
+++ b/libs/input/Android.bp
@@ -40,8 +40,11 @@
"Keyboard.cpp",
"KeyCharacterMap.cpp",
"KeyLayoutMap.cpp",
+ "LatencyStatistics.cpp",
"PropertyMap.cpp",
"TouchVideoFrame.cpp",
+ "VelocityControl.cpp",
+ "VelocityTracker.cpp",
"VirtualKeyMap.cpp",
],
@@ -69,9 +72,6 @@
srcs: [
"InputTransport.cpp",
"InputWindow.cpp",
- "LatencyStatistics.cpp",
- "VelocityControl.cpp",
- "VelocityTracker.cpp",
"android/FocusRequest.aidl",
"android/InputApplicationInfo.aidl",
"android/os/IInputConstants.aidl",
@@ -99,12 +99,33 @@
shared: {
enabled: false,
},
+ include_dirs: [
+ "frameworks/native/libs/arect/include",
+ ],
+ },
+ linux_glibc: {
+ srcs: [
+ "InputTransport.cpp",
+ "InputWindow.cpp",
+ "android/FocusRequest.aidl",
+ "android/InputApplicationInfo.aidl",
+ "android/os/IInputConstants.aidl",
+ "android/os/IInputFlinger.aidl",
+ "android/os/ISetInputWindowsListener.aidl",
+ "android/os/TouchOcclusionMode.aidl",
+ ],
+ static_libs: [
+ "libhostgraphics",
+ ],
+ shared_libs: [
+ "libbinder",
+ ],
},
},
aidl: {
local_include_dirs: ["."],
- export_aidl_headers: true
+ export_aidl_headers: true,
},
}
diff --git a/libs/input/Input.cpp b/libs/input/Input.cpp
index fb2f186..f3b8832 100644
--- a/libs/input/Input.cpp
+++ b/libs/input/Input.cpp
@@ -26,8 +26,8 @@
#include <input/InputDevice.h>
#include <input/InputEventLabels.h>
-#ifdef __ANDROID__
#include <binder/Parcel.h>
+#ifdef __ANDROID__
#include <sys/random.h>
#endif
@@ -250,7 +250,6 @@
setAxisValue(AMOTION_EVENT_AXIS_Y, getY() + yOffset);
}
-#ifdef __ANDROID__
status_t PointerCoords::readFromParcel(Parcel* parcel) {
bits = parcel->readInt64();
@@ -274,7 +273,6 @@
}
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 @@
}
}
-#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 @@
}
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 7ac8a2e..2623ecd 100644
--- a/libs/input/KeyCharacterMap.cpp
+++ b/libs/input/KeyCharacterMap.cpp
@@ -19,10 +19,7 @@
#include <stdlib.h>
#include <string.h>
-#ifdef __ANDROID__
#include <binder/Parcel.h>
-#endif
-
#include <android/keycodes.h>
#include <attestation/HmacKeyManager.h>
#include <input/InputEventLabels.h>
@@ -590,7 +587,6 @@
}
}
-#ifdef __ANDROID__
std::shared_ptr<KeyCharacterMap> KeyCharacterMap::readFromParcel(Parcel* parcel) {
if (parcel == nullptr) {
ALOGE("%s: Null parcel", __func__);
@@ -676,7 +672,6 @@
parcel->writeInt32(0);
}
}
-#endif
// --- KeyCharacterMap::Key ---
diff --git a/libs/ui/Android.bp b/libs/ui/Android.bp
index e3ae270..7c68aaa 100644
--- a/libs/ui/Android.bp
+++ b/libs/ui/Android.bp
@@ -243,6 +243,8 @@
name: "libui_host_common",
srcs: [
"Rect.cpp",
- "PixelFormat.cpp"
+ "Region.cpp",
+ "PixelFormat.cpp",
+ "Transform.cpp"
],
}