From: Colin Cross <ccross@android.com>
Date: Tue, 17 Aug 2021 00:17:03 +0000 (-0700)
Subject: AOSP: Fix e2fsdroid build with musl
X-Git-Tag: v1.46.6-wc1~95
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=1950b65452198630b55703f6f14c0d554a7f05fe;hp=9892631d0426ac07aceb1939cf0430481461dd63;p=tools%2Fe2fsprogs.git

AOSP: Fix e2fsdroid build with musl

The e2fsdroid build fails with musl because config.h is not included
before ext2fs.h, which causes HAVE_SYS_TYPES_H not to be defined
resulting in a missing definition for dev_t.

Include config.h at the top of each .c file, and remove extra
config.h include from perms.h.

Bug: 190084016
Test: m USE_HOST_MUSL=true fastboot
Change-Id: I95b3fff3f10ba85c00ec049811dd6b5d412e5dd2
From AOSP commit: 09c63d5edd35e3ca8366be0d92aad922d8895ac1
---

diff --git a/contrib/android/e2fsdroid.c b/contrib/android/e2fsdroid.c
index f5d24b8..6e51414 100644
--- a/contrib/android/e2fsdroid.c
+++ b/contrib/android/e2fsdroid.c
@@ -1,11 +1,11 @@
 #define _GNU_SOURCE
 
+#include "config.h"
 #include <stdio.h>
 #include <getopt.h>
 #include <string.h>
 #include <unistd.h>
 #include <limits.h>
-#include <ext2fs/ext2fs.h>
 
 #include "perms.h"
 #include "base_fs.h"
diff --git a/contrib/android/perms.c b/contrib/android/perms.c
index 9c5ec05..dd05644 100644
--- a/contrib/android/perms.c
+++ b/contrib/android/perms.c
@@ -1,6 +1,7 @@
 #ifndef _GNU_SOURCE
 # define _GNU_SOURCE //asprintf
 #endif
+#include "config.h"
 #include "perms.h"
 #include "support/nls-enable.h"
 #include <time.h>
diff --git a/contrib/android/perms.h b/contrib/android/perms.h
index 7987127..9ea3f95 100644
--- a/contrib/android/perms.h
+++ b/contrib/android/perms.h
@@ -1,7 +1,6 @@
 #ifndef ANDROID_PERMS_H
 # define ANDROID_PERMS_H
 
-# include "config.h"
 # include <ext2fs/ext2fs.h>
 
 typedef void (*fs_config_f)(const char *path, int dir,
diff --git a/e2fsck/jfs_user.h b/e2fsck/jfs_user.h
index 4ad2005..969cd1b 100644
--- a/e2fsck/jfs_user.h
+++ b/e2fsck/jfs_user.h
@@ -11,6 +11,8 @@
 #ifndef _JFS_USER_H
 #define _JFS_USER_H
 
+#include "config.h"
+
 #ifdef DEBUGFS
 #include <stdio.h>
 #include <stdlib.h>
@@ -27,7 +29,6 @@
 /*
  * Pull in the definition of the e2fsck context structure
  */
-#include "config.h"
 #include "e2fsck.h"
 #endif