diff options
| author | Elliott Hughes <enh@google.com> | 2015-01-10 00:18:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-10 00:18:15 +0000 |
| commit | e0e29de5c1e9a630679b44af214dc869cd53b809 (patch) | |
| tree | f0ed3fb3bbd0a55fbb0f6f1e49ce1c3ec8f1a3d4 /services/inputflinger/Android.mk | |
| parent | 04aa9ad7eb237dae7b6858092bc5e0cc824592bb (diff) | |
| parent | 23958e1436565b333ce7f3022bc52a10d4732ef6 (diff) | |
| download | frameworks_native-e0e29de5c1e9a630679b44af214dc869cd53b809.zip frameworks_native-e0e29de5c1e9a630679b44af214dc869cd53b809.tar.gz frameworks_native-e0e29de5c1e9a630679b44af214dc869cd53b809.tar.bz2 | |
am 23958e14: am a7dcab69: Merge "We have POSIX clocks, and we don\'t need to ask for the openssl headers."
* commit '23958e1436565b333ce7f3022bc52a10d4732ef6':
We have POSIX clocks, and we don't need to ask for the openssl headers.
Diffstat (limited to 'services/inputflinger/Android.mk')
| -rw-r--r-- | services/inputflinger/Android.mk | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/services/inputflinger/Android.mk b/services/inputflinger/Android.mk index 2edc07d..add5108 100644 --- a/services/inputflinger/Android.mk +++ b/services/inputflinger/Android.mk @@ -32,16 +32,13 @@ LOCAL_SHARED_LIBRARIES := \ libinput \ liblog \ libutils \ - libui \ - libhardware_legacy + libui \ + libhardware_legacy # TODO: Move inputflinger to its own process and mark it hidden #LOCAL_CFLAGS += -fvisibility=hidden -LOCAL_C_INCLUDES := \ - external/openssl/include \ - LOCAL_CFLAGS += -Wno-unused-parameter LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) |