Merge https://github.com/limelight-stream/limelight-android

app/src/main/jni/evdev_reader/Android.mk

@@ -10,4 +10,23 @@ LOCAL_MODULE    := evdev_reader
 LOCAL_SRC_FILES := evdev_reader.c
 LOCAL_LDLIBS    := -llog
 
-include $(BUILD_SHARED_LIBRARY)
+
+# This next portion of the makefile is mostly copied from build-executable.mk but
+# creates a binary with the libXXX.so form so the APK will install and drop
+# the binary correctly.
+
+LOCAL_BUILD_SCRIPT := BUILD_EXECUTABLE
+LOCAL_MAKEFILE     := $(local-makefile)
+
+$(call check-defined-LOCAL_MODULE,$(LOCAL_BUILD_SCRIPT))
+$(call check-LOCAL_MODULE,$(LOCAL_MAKEFILE))
+$(call check-LOCAL_MODULE_FILENAME)
+
+# we are building target objects
+my := TARGET_
+
+$(call handle-module-filename,lib,$(TARGET_SONAME_EXTENSION))
+$(call handle-module-built)
+
+LOCAL_MODULE_CLASS := EXECUTABLE
+include $(BUILD_SYSTEM)/build-module.mk