aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Marshall <tdm.code@gmail.com>2017-09-15 19:53:02 +0000
committerRashed Abdel-Tawab <rashed@linux.com>2017-12-05 15:40:39 -0800
commitc90b8ac0123a27b6cb7221933417569820440d42 (patch)
tree2addd705a3b81b56460a3a8d141f5d969d52b494
parent60ac66e515acfdf3c5b4ee49b74e3b76029436c5 (diff)
downloadandroid_external_e2fsprogs-c90b8ac0123a27b6cb7221933417569820440d42.tar.gz
android_external_e2fsprogs-c90b8ac0123a27b6cb7221933417569820440d42.tar.bz2
android_external_e2fsprogs-c90b8ac0123a27b6cb7221933417569820440d42.zip
e2fsprogs: Build static libs for recovery
* Add libe2fsck, libmke2fs. * Allow libext2_profile to build statically. Change-Id: If676329230db0dd868453c406392f584e3a24dbe
-rw-r--r--e2fsck/Android.bp7
-rw-r--r--lib/support/Android.bp2
-rw-r--r--misc/Android.bp12
3 files changed, 20 insertions, 1 deletions
diff --git a/e2fsck/Android.bp b/e2fsck/Android.bp
index 3eb86595..9699540c 100644
--- a/e2fsck/Android.bp
+++ b/e2fsck/Android.bp
@@ -62,3 +62,10 @@ cc_binary {
static_libs: e2fsck_libs,
}
+
+cc_library_static {
+ name: "libe2fsck",
+ defaults: ["e2fsck-defaults"],
+ cflags: ["-Dmain=e2fsck_main"],
+ include_dirs: ["external/e2fsprogs/lib"],
+}
diff --git a/lib/support/Android.bp b/lib/support/Android.bp
index 4a89b8f3..65a55ca7 100644
--- a/lib/support/Android.bp
+++ b/lib/support/Android.bp
@@ -38,7 +38,7 @@ cc_library {
export_header_lib_headers: ["libext2-headers"],
}
-cc_library_shared {
+cc_library {
name: "libext2_profile",
host_supported: true,
unique_host_soname: true,
diff --git a/misc/Android.bp b/misc/Android.bp
index c4387369..cd50b1ed 100644
--- a/misc/Android.bp
+++ b/misc/Android.bp
@@ -79,6 +79,18 @@ cc_binary {
include_dirs: ["external/e2fsprogs/e2fsck"],
}
+cc_library_static {
+ name: "libmke2fs",
+ srcs: [
+ "mke2fs.c",
+ "mk_hugefiles.c",
+ "default_profile.c",
+ "create_inode.c",
+ ],
+ cflags: ["-W", "-Wall", "-Wno-macro-redefined", "-DBUILD_AS_LIB"],
+ include_dirs: ["external/e2fsprogs/lib", "external/e2fsprogs/e2fsck"],
+}
+
//##########################################################################
// Build tune2fs