diff --git a/Android.mk b/Android.mk
index a93d01d..d3568f4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -110,7 +110,7 @@
 LOCAL_CLANG := true
 LOCAL_SRC_FILES := $(libminijailSrcFiles)
 
-LOCAL_STATIC_LIBRARIES := libminijail_generated $(minijailCommonLibraries)
+LOCAL_WHOLE_STATIC_LIBRARIES := libminijail_generated $(minijailCommonLibraries)
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 include $(BUILD_STATIC_LIBRARY)
 
diff --git a/libminijail.c b/libminijail.c
index da2ea54..15ac5f7 100644
--- a/libminijail.c
+++ b/libminijail.c
@@ -224,8 +224,8 @@
 	j->flags.gid = 1;
 }
 
-int API minijail_set_supplementary_gids(struct minijail *j, size_t size,
-					const gid_t *list)
+void API minijail_set_supplementary_gids(struct minijail *j, size_t size,
+					 const gid_t *list)
 {
 	size_t i;
 
@@ -237,7 +237,7 @@
 		j->suppl_gid_list = NULL;
 		j->suppl_gid_count = 0;
 		j->flags.suppl_gids = 1;
-		return 0;
+		return;
 	}
 
 	/* Copy the gid_t array. */
@@ -250,7 +250,6 @@
 	}
 	j->suppl_gid_count = size;
 	j->flags.suppl_gids = 1;
-	return 0;
 }
 
 int API minijail_change_user(struct minijail *j, const char *user)
diff --git a/libminijail.h b/libminijail.h
index ecc385a..fdd0d93 100644
--- a/libminijail.h
+++ b/libminijail.h
@@ -41,8 +41,8 @@
 void minijail_change_uid(struct minijail *j, uid_t uid);
 void minijail_change_gid(struct minijail *j, gid_t gid);
 /* Copies |list|. */
-int minijail_set_supplementary_gids(struct minijail *j, size_t size,
-				    const gid_t *list);
+void minijail_set_supplementary_gids(struct minijail *j, size_t size,
+				     const gid_t *list);
 /* Stores user to change to and copies |user| for internal consistency. */
 int minijail_change_user(struct minijail *j, const char *user);
 /* Does not take ownership of |group|. */