commit 6071da7ef84c60645572654504813d492b8b21d5
author Elliott Hughes <enh@google.com> Wed Aug 12 15:27:47 2015 -0700
committer Elliott Hughes <enh@google.com> Wed Aug 12 15:27:47 2015 -0700
tree 4b9f98fe510268b64bc82cc473bd0ece91da0d30
parent 1efe1bdde9baf40741febbf965ce01a4168a7860

Lose HAVE_ANDROID_OS from frameworks/native.

Change-Id: I8e6af2a46a9d875192fc7957ada9b5f66d84bad6

include/input/KeyCharacterMap.h

diff --git a/include/input/KeyCharacterMap.h b/include/input/KeyCharacterMap.h
index e70666a..111139b 100644
--- a/include/input/KeyCharacterMap.h
+++ b/include/input/KeyCharacterMap.h
@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 
-#if HAVE_ANDROID_OS
+#ifdef __ANDROID__
 #include <binder/IBinder.h>
 #endif
 
@@ -124,7 +124,7 @@
      * the mapping in some way. */
     status_t mapKey(int32_t scanCode, int32_t usageCode, int32_t* outKeyCode) const;
 
-#if HAVE_ANDROID_OS
+#ifdef __ANDROID__
     /* Reads a key map from a parcel. */
     static sp<KeyCharacterMap> readFromParcel(Parcel* parcel);