Remove Android specific code paths

Signed-off-by: Jo-Philipp Wich <[email protected]>

Author: jow-

canned_fs_config.c

@@ -20,8 +20,6 @@
 #include <limits.h>
 #include <stdlib.h>
 
-#include "private/android_filesystem_config.h"
-
 #include "canned_fs_config.h"
 
 typedef struct {

include/private/android_filesystem_config.h

@@ -147,7 +147,6 @@ static u32 build_directory_structure(const char *full_path, const char *dir_path
 		}
 		uint64_t capabilities;
 		if (fs_config_func != NULL) {
-#ifdef ANDROID
 			unsigned int mode = 0;
 			unsigned int uid = 0;
 			unsigned int gid = 0;
@@ -157,9 +156,6 @@ static u32 build_directory_structure(const char *full_path, const char *dir_path
 			dentries[i].uid = uid;
 			dentries[i].gid = gid;
 			dentries[i].capabilities = capabilities;
-#else
-			error("can't set android permissions - built without android support");
-#endif
 		}
 
 		if (S_ISREG(stat.st_mode)) {

make_ext4fs.c

@@ -25,10 +25,6 @@
 #include <sys/disk.h>
 #endif
 
-#ifdef ANDROID
-#include <private/android_filesystem_config.h>
-#endif
-
 #include "make_ext4fs.h"
 #include "ext4_utils.h"
 #include "canned_fs_config.h"
@@ -64,7 +60,7 @@ int main(int argc, char **argv)
 	time_t fixed_time = -1;
 	FILE* block_list_file = NULL;
 
-	while ((opt = getopt(argc, argv, "l:j:b:g:i:I:L:a:T:C:B:fwzJsctv")) != -1) {
+	while ((opt = getopt(argc, argv, "l:j:b:g:i:I:L:T:C:B:fwzJsctv")) != -1) {
 		switch (opt) {
 		case 'l':
 			info.len = parse_num(optarg);
@@ -90,15 +86,6 @@ int main(int argc, char **argv)
 		case 'f':
 			force = 1;
 			break;
-		case 'a':
-#ifdef ANDROID
-			mountpoint = optarg;
-#else
-			fprintf(stderr, "can't set android permissions - built without android support\n");
-			usage(argv[0]);
-			exit(EXIT_FAILURE);
-#endif
-			break;
 		case 'w':
 			wipe = 1;
 			break;