AOSP: Add "libc" to soong static_executable targets.

When building a static exectuable for "arm", the libgcc is automatically
included by the build system *after* libc, but libgcc has some symbol
dependencies on "libc", like for example the "raise" symbol.

libgcc, libatomic and libcompiler_rt-extras are passed in a group
(enclosed by --start-group and --end-group) so they all are included
regardless of the order inside that group. Nevertheless libc only
appears outside this group and before them, so the undefined references
from libgcc are not resolved.

This patch adds "libc" as a explicit static_libs dependency to
static_executable targets forcing it to be included in the group.

Bug: 34220783
Test: mmma external/e2fsprogs
Change-Id: Ia18db10da0f18494600d7e0c870291902d71b287
From AOSP commit: b799ad178fa18c2925a283206496d3f5d6e87f35

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/debugfs/Android.bp b/debugfs/Android.bp
index be0042ad1c9ba0b9247d409cbe4da3421650915b..b60b45354f5ad185de816af478dbb6d2e9821f53 100644 (file)
--- 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 68b4750578651c2af3fab55b505a53e5fd9fad42..0e1f9b88162b3efaf2a7fb7bd284f5a4b59d9a64 100644 (file)
--- 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 be63b4c870f92fa07492903e624bf95b793bf1f4..f75c9d158e488c7274cd87dd2b95c0fdb3d20468 100644 (file)
--- 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"],
 }
 
 //########################################################################