aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavlin Radoslavov <pavlin@google.com>2017-08-23 23:52:29 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-08-23 23:52:29 +0000
commit7baf0aea82a38db39de8dc4787aaba4538ad91d7 (patch)
tree9a29432d3fdb27d102df45dcc9fde5f44625fc6f
parent9a0659fd602d7028a779e87fd5905f47f1950c95 (diff)
parentd954a5bd5b1352b452f7e5b8b726cd9491b85739 (diff)
downloadandroid_external_e2fsprogs-7baf0aea82a38db39de8dc4787aaba4538ad91d7.tar.gz
android_external_e2fsprogs-7baf0aea82a38db39de8dc4787aaba4538ad91d7.tar.bz2
android_external_e2fsprogs-7baf0aea82a38db39de8dc4787aaba4538ad91d7.zip
Merge "Add missing libdl dependencies" am: 1f984ce998 am: 3c9ffea95b am: 85cb39e230
am: d954a5bd5b Change-Id: I36c96ebb80af1fcc1740b40a7388d961025c938d
-rw-r--r--contrib/Android.bp4
-rw-r--r--debugfs/Android.bp2
-rw-r--r--e2fsck/Android.bp2
-rw-r--r--misc/Android.bp16
-rw-r--r--resize/Android.bp2
5 files changed, 13 insertions, 13 deletions
diff --git a/contrib/Android.bp b/contrib/Android.bp
index c2d5cd91..d4d7874b 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 4a2da2e7..adaa6354 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 34ba450e..3eb86595 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 3b5f7c18..e2c3d11b 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 6d3d3217..dcdf6591 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"],
}