diff --git a/Android.mk b/Android.mk
index 28d585bb..cc8a6866 100644
--- a/Android.mk
+++ b/Android.mk
@@ -56,36 +56,11 @@ SERVALD_LOCAL_CFLAGS = \
 SERVALD_LOCAL_LDLIBS = -L$(SYSROOT)/usr/lib -llog
 SERVALD_LOCAL_STATIC_LIBRARIES += sodium
 
-# Build libservald.so
+# Build libservaldtatic.a
 include $(CLEAR_VARS)
 LOCAL_STATIC_LIBRARIES := $(SERVALD_LOCAL_STATIC_LIBRARIES)
 LOCAL_SRC_FILES := $(SERVALD_SRC_FILES) version_servald.c
 LOCAL_CFLAGS += $(SERVALD_LOCAL_CFLAGS)
 LOCAL_C_INCLUDES += $(SODIUM_INCLUDE)
-LOCAL_LDLIBS := $(SERVALD_LOCAL_LDLIBS)
-LOCAL_MODULE := servaldaemon
-include $(BUILD_SHARED_LIBRARY)
-
-# Build servald executable, a wrapper around libservald.so
-ifdef SERVALD_WRAP
-  include $(CLEAR_VARS)
-  LOCAL_SRC_FILES:= servalwrap.c
-  LOCAL_MODULE:= servald
-  LOCAL_CFLAGS += -fPIE
-  LOCAL_LDFLAGS += -fPIE -pie
-  include $(BUILD_EXECUTABLE)
-endif
-
-# Build servald executable for use with gdb
-ifdef SERVALD_SIMPLE
-  include $(CLEAR_VARS)
-  LOCAL_SRC_FILES:= $(SERVALD_SRC_FILES) version_servald.c
-  LOCAL_CFLAGS += $(SERVALD_LOCAL_CFLAGS)
-  LOCAL_LDLIBS := $(SERVALD_LOCAL_LDLIBS)
-  LOCAL_C_INCLUDES += $(SODIUM_INCLUDE)
-  LOCAL_STATIC_LIBRARIES := $(SERVALD_LOCAL_STATIC_LIBRARIES)
-  LOCAL_MODULE:= servaldsimple
-  LOCAL_CFLAGS += -fPIE
-  LOCAL_LDFLAGS += -fPIE -pie
-  include $(BUILD_EXECUTABLE)
-endif
+LOCAL_MODULE := servaldstatic
+include $(BUILD_STATIC_LIBRARY)