Merge branch 'maint' into next

[thirdparty/e2fsprogs.git] / e2fsck / Android.bp

diff --git a/e2fsck/Android.bp b/e2fsck/Android.bp
index 1cabe86d71fb2c09916a19663204f36d53d97ac4..5c802ac6dd867e97bd12a8c5144c2e3d1fe4fd56 100644 (file)
--- a/e2fsck/Android.bp
+++ b/e2fsck/Android.bp
@@ -5,6 +5,7 @@
 
 cc_defaults {
     name: "e2fsck-defaults",
+    defaults: ["e2fsprogs-defaults"],
     srcs: [
         "e2fsck.c",
         "super.c",
@@ -33,16 +34,20 @@ cc_defaults {
         "sigcatcher.c",
         "readahead.c",
         "extents.c",
+        "encrypted_files.c",
+    ],
+    cflags: [
+        "-Wno-sign-compare",
+        "-fno-strict-aliasing",
     ],
-    cflags: ["-W", "-Wall", "-Wno-macro-redefined", "-fno-strict-aliasing"],
 }
 
 e2fsck_libs = [
     "libext2fs",
     "libext2_blkid",
+    "libext2_com_err",
     "libext2_uuid",
     "libext2_quota",
-    "libext2_com_err",
     "libext2_e2p",
 ]
 
@@ -52,7 +57,7 @@ cc_binary {
     defaults: ["e2fsck-defaults"],
 
     shared_libs: e2fsck_libs,
-    system_shared_libs: ["libc"],
+    system_shared_libs: ["libc", "libdl"],
 }
 
 cc_binary {
@@ -60,5 +65,5 @@ cc_binary {
     static_executable: true,
     defaults: ["e2fsck-defaults"],
 
-    static_libs: e2fsck_libs + ["libc"],
+    static_libs: e2fsck_libs,
 }