diff options
| author | 2020-10-29 17:43:49 +0000 | |
|---|---|---|
| committer | 2020-10-29 17:43:49 +0000 | |
| commit | 08a8d53960e91d453ab479e6f41eb8c46a556d1f (patch) | |
| tree | 54264daa087aa883dd6da8d5084843da5b0b61bd /libs/input/KeyCharacterMap.cpp | |
| parent | f4b1410afa384815ea89dd4b089df4ebce2068ff (diff) | |
| parent | 5820852c0f0fe634a104f81691ad3e0026caecdc (diff) | |
Merge "Build all of libinput for linux host."
Diffstat (limited to 'libs/input/KeyCharacterMap.cpp')
| -rw-r--r-- | libs/input/KeyCharacterMap.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libs/input/KeyCharacterMap.cpp b/libs/input/KeyCharacterMap.cpp index 7ac8a2e02c..2623ecde45 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 @@ void KeyCharacterMap::addLockedMetaKey(Vector<KeyEvent>& outEvents, } } -#ifdef __ANDROID__ std::shared_ptr<KeyCharacterMap> KeyCharacterMap::readFromParcel(Parcel* parcel) { if (parcel == nullptr) { ALOGE("%s: Null parcel", __func__); @@ -676,7 +672,6 @@ void KeyCharacterMap::writeToParcel(Parcel* parcel) const { parcel->writeInt32(0); } } -#endif // --- KeyCharacterMap::Key --- |