From 33b80078dbc2294339aa81b752ee3ebf118aaf5b Mon Sep 17 00:00:00 2001 From: Jeff Gaston Date: Thu, 16 Mar 2017 15:41:13 -0700 Subject: [PATCH] AOSP: Revert "Add "libc" to soong static_executable targets." This reverts commit b799ad178fa18c2925a283206496d3f5d6e87f35. It's no longer needed after https://android-review.googlesource.com/c/329298/ Bug: 34722432 Test: lunch aosp_arm-eng && mmma external/e2fsprogs Change-Id: I4115fe89ef7751364053223be24e7682e66b6b67 From AOSP commit: 34115ec38e86ba3cc17ae7a866e891abf7bd3aeb --- debugfs/Android.bp | 2 +- e2fsck/Android.bp | 2 +- misc/Android.bp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debugfs/Android.bp b/debugfs/Android.bp index bdd85e2..adaa635 100644 --- a/debugfs/Android.bp +++ b/debugfs/Android.bp @@ -68,5 +68,5 @@ cc_binary { static_executable: true, defaults: ["debugfs-defaults"], - static_libs: debugfs_libs + ["libc"], + static_libs: debugfs_libs, } diff --git a/e2fsck/Android.bp b/e2fsck/Android.bp index 0edf987..3eb8659 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 + ["libc"], + static_libs: e2fsck_libs, } diff --git a/misc/Android.bp b/misc/Android.bp index 8db9ba6..7a10817 100644 --- a/misc/Android.bp +++ b/misc/Android.bp @@ -132,7 +132,7 @@ cc_binary { static_executable: true, defaults: ["tune2fs-defaults"], - static_libs: tune2fs_libs + ["libc"], + static_libs: tune2fs_libs, } cc_library_static { @@ -206,7 +206,7 @@ cc_binary { static_executable: true, defaults: ["lsattr-defaults"], - static_libs: lsattr_libs + ["libc"], + static_libs: lsattr_libs, } //######################################################################## -- 1.8.3.1