Add files that would normally be generated by the e2fsprogs build system

Android doesn't run ./configure and friends, so it has to rely on
pre-populated versions of the autogenerated files.

This is somewhat bogus (e.g. hardcoded little-endian reference in
lib/ext2fs/ext2_types.h) and should at some point be fixed, but it's
what Android has always done, not a regression from the 1.41.14 branch.

Also, don't #include config.h which we don't generate (we pass what it
usually contains as -D parameters from Android.mk) anywhere.

Add a new Android.mk file for the quota library.

Change-Id: I162c6327fee5bd06261d9cdcc34bda10f04a6f21
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>

15 files changed, 243 insertions, 13 deletions

diff --git a/lib/blkid/blkid.h b/lib/blkid/blkid.h
new file mode 100644
index 00000000..81f3098c
--- /dev/null
+++ b/lib/blkid/blkid.h
@@ -0,0 +1,110 @@
+/*
+ * blkid.h - Interface for libblkid, a library to identify block devices
+ *
+ * Copyright (C) 2001 Andreas Dilger
+ * Copyright (C) 2003 Theodore Ts'o
+ *
+ * %Begin-Header%
+ * This file may be redistributed under the terms of the
+ * GNU Lesser General Public License.
+ * %End-Header%
+ */
+
+#ifndef _BLKID_BLKID_H
+#define _BLKID_BLKID_H
+
+#include <sys/types.h>
+#include <blkid/blkid_types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define BLKID_VERSION	"1.0.0"
+#define BLKID_DATE	"12-Feb-2003"
+
+typedef struct blkid_struct_dev *blkid_dev;
+typedef struct blkid_struct_cache *blkid_cache;
+typedef __s64 blkid_loff_t;
+
+typedef struct blkid_struct_tag_iterate *blkid_tag_iterate;
+typedef struct blkid_struct_dev_iterate *blkid_dev_iterate;
+
+/*
+ * Flags for blkid_get_dev
+ *
+ * BLKID_DEV_CREATE	Create an empty device structure if not found
+ * 			in the cache.
+ * BLKID_DEV_VERIFY	Make sure the device structure corresponds
+ * 			with reality.
+ * BLKID_DEV_FIND	Just look up a device entry, and return NULL
+ * 			if it is not found.
+ * BLKID_DEV_NORMAL	Get a valid device structure, either from the
+ * 			cache or by probing the device.
+ */
+#define BLKID_DEV_FIND		0x0000
+#define BLKID_DEV_CREATE	0x0001
+#define BLKID_DEV_VERIFY	0x0002
+#define BLKID_DEV_NORMAL	(BLKID_DEV_CREATE | BLKID_DEV_VERIFY)
+
+/* cache.c */
+extern void blkid_put_cache(blkid_cache cache);
+extern int blkid_get_cache(blkid_cache *cache, const char *filename);
+extern void blkid_gc_cache(blkid_cache cache);
+
+/* dev.c */
+extern const char *blkid_dev_devname(blkid_dev dev);
+
+extern blkid_dev_iterate blkid_dev_iterate_begin(blkid_cache cache);
+extern int blkid_dev_set_search(blkid_dev_iterate iter,
+				char *search_type, char *search_value);
+extern int blkid_dev_next(blkid_dev_iterate iterate, blkid_dev *dev);
+extern void blkid_dev_iterate_end(blkid_dev_iterate iterate);
+
+/* devno.c */
+extern char *blkid_devno_to_devname(dev_t devno);
+
+/* devname.c */
+extern int blkid_probe_all(blkid_cache cache);
+extern int blkid_probe_all_new(blkid_cache cache);
+extern blkid_dev blkid_get_dev(blkid_cache cache, const char *devname,
+			       int flags);
+
+/* getsize.c */
+extern blkid_loff_t blkid_get_dev_size(int fd);
+
+/* probe.c */
+int blkid_known_fstype(const char *fstype);
+extern blkid_dev blkid_verify(blkid_cache cache, blkid_dev dev);
+
+/* read.c */
+
+/* resolve.c */
+extern char *blkid_get_tag_value(blkid_cache cache, const char *tagname,
+				       const char *devname);
+extern char *blkid_get_devname(blkid_cache cache, const char *token,
+			       const char *value);
+
+/* tag.c */
+extern blkid_tag_iterate blkid_tag_iterate_begin(blkid_dev dev);
+extern int blkid_tag_next(blkid_tag_iterate iterate,
+			      const char **type, const char **value);
+extern void blkid_tag_iterate_end(blkid_tag_iterate iterate);
+extern int blkid_dev_has_tag(blkid_dev dev, const char *type,
+			     const char *value);
+extern blkid_dev blkid_find_dev_with_tag(blkid_cache cache,
+					 const char *type,
+					 const char *value);
+extern int blkid_parse_tag_string(const char *token, char **ret_type,
+				  char **ret_val);
+
+/* version.c */
+extern int blkid_parse_version_string(const char *ver_string);
+extern int blkid_get_library_version(const char **ver_string,
+				     const char **date_string);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _BLKID_BLKID_H */
diff --git a/lib/blkid/blkid_types.h b/lib/blkid/blkid_types.h
new file mode 100644
index 00000000..3ffaee54
--- /dev/null
+++ b/lib/blkid/blkid_types.h
@@ -0,0 +1,133 @@
+/* 
+ * If linux/types.h is already been included, assume it has defined
+ * everything we need.  (cross fingers)  Other header files may have 
+ * also defined the types that we need.
+ */
+#if (!defined(_LINUX_TYPES_H) && !defined(_BLKID_TYPES_H) && \
+	!defined(_EXT2_TYPES_H))
+#define _BLKID_TYPES_H
+
+
+#ifdef __U8_TYPEDEF
+typedef __U8_TYPEDEF __u8;
+#else
+typedef unsigned char __u8;
+#endif
+
+#ifdef __S8_TYPEDEF
+typedef __S8_TYPEDEF __s8;
+#else
+typedef signed char __s8;
+#endif
+
+#ifdef __U16_TYPEDEF
+typedef __U16_TYPEDEF __u16;
+#else
+#if (4 == 2)
+typedef	unsigned int	__u16;
+#else
+#if (2 == 2)
+typedef	unsigned short	__u16;
+#else
+  ?==error: undefined 16 bit type
+#endif /* SIZEOF_SHORT == 2 */
+#endif /* SIZEOF_INT == 2 */
+#endif /* __U16_TYPEDEF */
+
+#ifdef __S16_TYPEDEF
+typedef __S16_TYPEDEF __s16;
+#else
+#if (4 == 2)
+typedef	int		__s16;
+#else
+#if (2 == 2)
+typedef	short		__s16;
+#else
+  ?==error: undefined 16 bit type
+#endif /* SIZEOF_SHORT == 2 */
+#endif /* SIZEOF_INT == 2 */
+#endif /* __S16_TYPEDEF */
+
+
+#ifdef __U32_TYPEDEF
+typedef __U32_TYPEDEF __u32;
+#else
+#if (4 == 4)
+typedef	unsigned int	__u32;
+#else
+#if (4 == 4)
+typedef	unsigned long	__u32;
+#else
+#if (2 == 4)
+typedef	unsigned short	__u32;
+#else
+ ?== error: undefined 32 bit type
+#endif /* SIZEOF_SHORT == 4 */
+#endif /* SIZEOF_LONG == 4 */
+#endif /* SIZEOF_INT == 4 */
+#endif /* __U32_TYPEDEF */
+
+#ifdef __S32_TYPEDEF
+typedef __S32_TYPEDEF __s32;
+#else
+#if (4 == 4)
+typedef	int		__s32;
+#else
+#if (4 == 4)
+typedef	long		__s32;
+#else
+#if (2 == 4)
+typedef	short		__s32;
+#else
+ ?== error: undefined 32 bit type
+#endif /* SIZEOF_SHORT == 4 */
+#endif /* SIZEOF_LONG == 4 */
+#endif /* SIZEOF_INT == 4 */
+#endif /* __S32_TYPEDEF */
+
+#ifdef __U64_TYPEDEF
+typedef __U64_TYPEDEF __u64;
+#else
+#if (4 == 8)
+typedef unsigned int	__u64;
+#else
+#if (8 == 8)
+typedef unsigned long long	__u64;
+#else
+#if (4 == 8)
+typedef unsigned long	__u64;
+#endif /* SIZEOF_LONG == 8 */
+#endif /* SIZEOF_LONG_LONG == 8 */
+#endif /* SIZEOF_INT == 8 */
+#endif /* __U64_TYPEDEF */
+
+#ifdef __S64_TYPEDEF
+typedef __S64_TYPEDEF __s64;
+#else
+#if (4 == 8)
+typedef int		__s64;
+#else
+#if (8 == 8)
+#if defined(__GNUC__)
+typedef __signed__ long long 	__s64;
+#else
+typedef signed long long 	__s64;
+#endif /* __GNUC__ */
+#else
+#if (4 == 8)
+typedef long		__s64;
+#endif /* SIZEOF_LONG == 8 */
+#endif /* SIZEOF_LONG_LONG == 8 */
+#endif /* SIZEOF_INT == 8 */
+#endif /* __S64_TYPEDEF */
+
+#undef __S8_TYPEDEF
+#undef __U8_TYPEDEF
+#undef __S16_TYPEDEF
+#undef __U16_TYPEDEF
+#undef __S32_TYPEDEF
+#undef __U32_TYPEDEF
+#undef __S64_TYPEDEF
+#undef __U64_TYPEDEF
+
+#endif /* _*_TYPES_H */
diff --git a/lib/blkid/cache.c b/lib/blkid/cache.c
index 8bdd2399..e2ccafd2 100644
--- a/lib/blkid/cache.c
+++ b/lib/blkid/cache.c
@@ -10,7 +10,6 @@
  * %End-Header%
  */
 
-#include "config.h"
 #if HAVE_SECURE_GETENV
 #define _GNU_SOURCE
 #endif
diff --git a/lib/blkid/dev.c b/lib/blkid/dev.c
index 6d8eaeac..128a869d 100644
--- a/lib/blkid/dev.c
+++ b/lib/blkid/dev.c
@@ -10,7 +10,6 @@
  * %End-Header%
  */
 
-#include "config.h"
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/lib/blkid/devname.c b/lib/blkid/devname.c
index a6673c17..b151354d 100644
--- a/lib/blkid/devname.c
+++ b/lib/blkid/devname.c
@@ -13,7 +13,6 @@
 
 #define _GNU_SOURCE 1
 
-#include "config.h"
 #include <stdio.h>
 #include <string.h>
 #include <limits.h>
diff --git a/lib/blkid/devno.c b/lib/blkid/devno.c
index 479d9776..c9f5c92c 100644
--- a/lib/blkid/devno.c
+++ b/lib/blkid/devno.c
@@ -10,7 +10,6 @@
  * %End-Header%
  */
 
-#include "config.h"
 #include <stdio.h>
 #include <string.h>
 #if HAVE_UNISTD_H
diff --git a/lib/blkid/getsize.c b/lib/blkid/getsize.c
index c2a8f72a..ac4177e2 100644
--- a/lib/blkid/getsize.c
+++ b/lib/blkid/getsize.c
@@ -13,7 +13,6 @@
 #define _LARGEFILE64_SOURCE
 
 /* include this before sys/queues.h! */
-#include "config.h"
 #include "blkidP.h"
 
 #include <stdio.h>
diff --git a/lib/blkid/llseek.c b/lib/blkid/llseek.c
index 658acc97..5bd0e516 100644
--- a/lib/blkid/llseek.c
+++ b/lib/blkid/llseek.c
@@ -12,7 +12,6 @@
 #define _LARGEFILE_SOURCE
 #define _LARGEFILE64_SOURCE
 
-#include "config.h"
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
diff --git a/lib/blkid/probe.c b/lib/blkid/probe.c
index bd31fe05..31385dbb 100644
--- a/lib/blkid/probe.c
+++ b/lib/blkid/probe.c
@@ -13,7 +13,6 @@
  * %End-Header%
  */
 
-#include "config.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/blkid/read.c b/lib/blkid/read.c
index efc348b9..ca2798f0 100644
--- a/lib/blkid/read.c
+++ b/lib/blkid/read.c
@@ -12,7 +12,6 @@
 
 #define _XOPEN_SOURCE 600 /* for inclusion of strtoull */
 
-#include "config.h"
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
diff --git a/lib/blkid/resolve.c b/lib/blkid/resolve.c
index 3bc37b0c..6c2e268d 100644
--- a/lib/blkid/resolve.c
+++ b/lib/blkid/resolve.c
@@ -10,7 +10,6 @@
  * %End-Header%
  */
 
-#include "config.h"
 #include <stdio.h>
 #if HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/lib/blkid/save.c b/lib/blkid/save.c
index 6c20168b..6802e9dc 100644
--- a/lib/blkid/save.c
+++ b/lib/blkid/save.c
@@ -10,7 +10,6 @@
  * %End-Header%
  */
 
-#include "config.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/blkid/tag.c b/lib/blkid/tag.c
index 1eae7df7..639ef89e 100644
--- a/lib/blkid/tag.c
+++ b/lib/blkid/tag.c
@@ -10,7 +10,6 @@
  * %End-Header%
  */
 
-#include "config.h"
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/blkid/tst_types.c b/lib/blkid/tst_types.c
index cb612aeb..3003c8b5 100644
--- a/lib/blkid/tst_types.c
+++ b/lib/blkid/tst_types.c
@@ -9,7 +9,6 @@
  * %End-Header%
  */
 
-#include "config.h"
 #include <sys/types.h>
 #include "blkid/blkid_types.h"
 
diff --git a/lib/blkid/version.c b/lib/blkid/version.c
index 54c17aa6..c9754fab 100644
--- a/lib/blkid/version.c
+++ b/lib/blkid/version.c
@@ -9,7 +9,6 @@
  * %End-Header%
  */
 
-#include "config.h"
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif