commit 84f8101db185ba26d028a32f1a6d212182b8162c
author Luke Huang <huangluke@google.com> Fri Jul 16 16:59:14 2021 +0800
committer Luke Huang <huangluke@google.com> Fri Jul 16 09:07:54 2021 +0000
tree e73413b4b00ae2adbd0c78b25fdf2c7e9663159b
parent 2fe9c73fb0f751bfb69e2f66fe55cb5d9f8acfdf

Fix resolv_{unit,gold}_test linking problem caused by Rust libs

The new linked Rust libs in DnsReoslver caused the
resolv_{unit,gold}_test executive problems due to missing libunwind
symbol.
Add libunwind into whole_static_libs list to fix the problem.

Test: manually run resolv_{unit,gold}_test in Android 10 device
Bug: 193850030
Change-Id: I9013085a20f8fd8bfb8b6f7e9fb7e33a327b98fe

Android.bp

diff --git a/Android.bp b/Android.bp
index 5e2f35c..eead5ab 100644
--- a/Android.bp
+++ b/Android.bp
@@ -397,7 +397,8 @@
         "liburl",
     ],
     prefer_rlib: true,
-
+    // For unit tests to run on the Android 10 platform, libunwind must be statically linked..
+    whole_static_libs: ["libunwind"],
     apex_available: [
         "//apex_available:platform",  // Needed by doh_ffi_test
         "com.android.resolv"