diff --git a/app/build.gradle b/app/build.gradle
index af246d5b..e67346da 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,11 +23,23 @@ android {
             // version to devices running O on the Play Store.
             maxSdkVersion 25
 
+            externalNativeBuild {
+                ndkBuild {
+                    arguments "PRODUCT_FLAVOR=root"
+                }
+            }
+
             applicationId "com.limelight.root"
             dimension "root"
         }
 
         nonRoot {
+            externalNativeBuild {
+                ndkBuild {
+                    arguments "PRODUCT_FLAVOR=nonRoot"
+                }
+            }
+
             applicationId "com.limelight"
             dimension "root"
         }
diff --git a/app/src/main/jni/evdev_reader/Android.mk b/app/src/main/jni/evdev_reader/Android.mk
index 2de922d1..a3c2ecb4 100644
--- a/app/src/main/jni/evdev_reader/Android.mk
+++ b/app/src/main/jni/evdev_reader/Android.mk
@@ -5,28 +5,32 @@ include $(call all-subdir-makefiles)
 
 LOCAL_PATH := $(MY_LOCAL_PATH)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE    := evdev_reader
-LOCAL_SRC_FILES := evdev_reader.c
-LOCAL_LDLIBS    := -llog
+# Only build evdev_reader for the rooted APK flavor
+ifeq (root,$(PRODUCT_FLAVOR))
+    include $(CLEAR_VARS)
+    LOCAL_MODULE    := evdev_reader
+    LOCAL_SRC_FILES := evdev_reader.c
+    LOCAL_LDLIBS    := -llog
 
 
-# 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.
+    # 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)
+    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)
+    $(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_
+    # we are building target objects
+    my := TARGET_
 
-$(call handle-module-filename,lib,$(TARGET_SONAME_EXTENSION))
-$(call handle-module-built)
+    $(call handle-module-filename,lib,$(TARGET_SONAME_EXTENSION))
+    $(call handle-module-built)
+
+    LOCAL_MODULE_CLASS := EXECUTABLE
+    include $(BUILD_SYSTEM)/build-module.mk
+endif
 
-LOCAL_MODULE_CLASS := EXECUTABLE
-include $(BUILD_SYSTEM)/build-module.mk