From: Pavlin Radoslavov <pavlin@google.com>
Date: Wed, 23 Aug 2017 22:02:55 +0000 (-0700)
Subject: AOSP: Add missing libdl dependencies
X-Git-Tag: v1.44.0-rc1~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88ca49f99becad31b8193b5e8e0c9719430745c9;p=thirdparty%2Fe2fsprogs.git

AOSP: Add missing libdl dependencies

Bug: 62815515
Test: lunch full-eng; make checkbuild
Change-Id: I1751669c4ed046c22587938e04eb76abe8553a8d
From AOSP commit: a24084ceb74c84b0943c86deb5cb99a63d3c46d7
---

diff --git a/contrib/Android.bp b/contrib/Android.bp
index c2d5cd91a..d4d7874bf 100644
--- a/contrib/Android.bp
+++ b/contrib/Android.bp
@@ -11,7 +11,7 @@ cc_binary {
 
     srcs: ["fsstress.c"],
     cflags: ["-W", "-Wall", "-Wno-macro-redefined"],
-    system_shared_libs: ["libc"],
+    system_shared_libs: ["libc", "libdl"],
 
     target: {
         darwin: {
@@ -33,5 +33,5 @@ cc_binary {
         "libext2fs",
         "libext2_com_err",
     ],
-    system_shared_libs: ["libc"],
+    system_shared_libs: ["libc", "libdl"],
 }
diff --git a/debugfs/Android.bp b/debugfs/Android.bp
index 7dfc7d3d8..bdd85e2a3 100644
--- a/debugfs/Android.bp
+++ b/debugfs/Android.bp
@@ -60,7 +60,7 @@ cc_binary {
     defaults: ["debugfs-defaults"],
 
     shared_libs: debugfs_libs,
-    system_shared_libs: ["libc"],
+    system_shared_libs: ["libc", "libdl"],
 }
 
 cc_binary {
diff --git a/e2fsck/Android.bp b/e2fsck/Android.bp
index 1cabe86d7..0edf98745 100644
--- a/e2fsck/Android.bp
+++ b/e2fsck/Android.bp
@@ -52,7 +52,7 @@ cc_binary {
     defaults: ["e2fsck-defaults"],
 
     shared_libs: e2fsck_libs,
-    system_shared_libs: ["libc"],
+    system_shared_libs: ["libc", "libdl"],
 }
 
 cc_binary {
diff --git a/misc/Android.bp b/misc/Android.bp
index 0d315f20c..9267b4131 100644
--- a/misc/Android.bp
+++ b/misc/Android.bp
@@ -21,7 +21,7 @@ cc_library {
         "libext2_quota",
         "libext2fs",
     ],
-    system_shared_libs: ["libc"],
+    system_shared_libs: ["libc", "libdl"],
     export_include_dirs: ["."],
 }
 
@@ -113,7 +113,7 @@ cc_binary {
     defaults: ["tune2fs-defaults"],
 
     shared_libs: tune2fs_libs,
-    system_shared_libs: ["libc"],
+    system_shared_libs: ["libc", "libdl"],
 }
 
 cc_binary {
@@ -148,7 +148,7 @@ cc_binary {
         "libext2_blkid",
         "libext2_e2p",
     ],
-    system_shared_libs: ["libc"],
+    system_shared_libs: ["libc", "libdl"],
 }
 
 //########################################################################
@@ -164,7 +164,7 @@ cc_binary {
         "libext2_com_err",
         "libext2_e2p",
     ],
-    system_shared_libs: ["libc"],
+    system_shared_libs: ["libc", "libdl"],
 }
 
 //########################################################################
@@ -187,7 +187,7 @@ cc_binary {
     defaults: ["lsattr-defaults"],
 
     shared_libs: lsattr_libs,
-    system_shared_libs: ["libc"],
+    system_shared_libs: ["libc", "libdl"],
 }
 
 cc_binary {
@@ -212,7 +212,7 @@ cc_binary {
         "libext2_com_err",
         "libext2_e2p",
     ],
-    system_shared_libs: ["libc"],
+    system_shared_libs: ["libc", "libdl"],
 }
 
 //########################################################################
@@ -228,7 +228,7 @@ cc_binary {
         "libext2fs",
         "libext2_uuid",
     ],
-    system_shared_libs: ["libc"],
+    system_shared_libs: ["libc", "libdl"],
 
     target: {
         darwin: {
@@ -252,5 +252,5 @@ cc_binary {
         "libext2_com_err",
         "libext2_quota",
     ],
-    system_shared_libs: ["libc"],
+    system_shared_libs: ["libc", "libdl"],
 }
diff --git a/resize/Android.bp b/resize/Android.bp
index 6d3d32173..dcdf65911 100644
--- a/resize/Android.bp
+++ b/resize/Android.bp
@@ -20,5 +20,5 @@ cc_binary {
         "libext2_uuid",
         "libext2_blkid",
     ],
-    system_shared_libs: ["libc"],
+    system_shared_libs: ["libc", "libdl"],
 }