aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deymo <deymo@google.com>2017-01-26 02:43:40 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-01-26 02:43:40 +0000
commitab361c4a19e0de87ae1049984b48b32e546bf1df (patch)
tree958a5646f738537736ec9a962fbe496c01e9fa3c
parent83024b7450d5a5e99e2a05108d55ea6cdfbcc0f6 (diff)
parenta0ad535dcdcb152dfbe7d5b17c5f046904f2cfd9 (diff)
downloade2fsprogs-ab361c4a19e0de87ae1049984b48b32e546bf1df.tar.gz
Merge "Add "libc" to soong static_executable targets." am: 98f63cd9de am: ea7db4e63a am: 668ec9e6b6android-o-preview-1o-preview
am: a0ad535dcd Change-Id: Ifb15f1cf46e68219346dcd7a0ed909b6a8b2473c
-rw-r--r--debugfs/Android.bp2
-rw-r--r--e2fsck/Android.bp2
-rw-r--r--misc/Android.bp4
3 files changed, 4 insertions, 4 deletions
diff --git a/debugfs/Android.bp b/debugfs/Android.bp
index be0042ad..b60b4535 100644
--- a/debugfs/Android.bp
+++ b/debugfs/Android.bp
@@ -67,5 +67,5 @@ cc_binary {
static_executable: true,
defaults: ["debugfs-defaults"],
- static_libs: debugfs_libs,
+ static_libs: debugfs_libs + ["libc"],
}
diff --git a/e2fsck/Android.bp b/e2fsck/Android.bp
index 68b47505..0e1f9b88 100644
--- a/e2fsck/Android.bp
+++ b/e2fsck/Android.bp
@@ -60,5 +60,5 @@ cc_binary {
static_executable: true,
defaults: ["e2fsck-defaults"],
- static_libs: e2fsck_libs,
+ static_libs: e2fsck_libs + ["libc"],
}
diff --git a/misc/Android.bp b/misc/Android.bp
index be63b4c8..f75c9d15 100644
--- a/misc/Android.bp
+++ b/misc/Android.bp
@@ -85,7 +85,7 @@ cc_binary {
static_executable: true,
defaults: ["tune2fs-defaults"],
- static_libs: tune2fs_libs,
+ static_libs: tune2fs_libs + ["libc"],
}
cc_library_static {
@@ -159,7 +159,7 @@ cc_binary {
static_executable: true,
defaults: ["lsattr-defaults"],
- static_libs: lsattr_libs,
+ static_libs: lsattr_libs + ["libc"],
}
//########################################################################