commit b6402aea0a93a69438dab624df1eed11beaca183
author Luke Huang <huangluke@google.com> Thu Mar 19 10:58:14 2020 +0000
committer Luke Huang <huangluke@google.com> Thu Mar 19 11:54:56 2020 +0000
tree f50d8e3f2eec334227aa1b2fafa4283b49bab8f6
parent 19a291bb57d222ebd0d9b5cfc7fc7a0c15596bdb

Refine the library linking for the tests of DnsResolver

Some MTS tests failed due to libbase becoming incompatible between Q and R.
Refine the linking for our tests to fix the problem and prevent similar issues.
1. liblog has stable C APIs so just have it linked shared.
2. Statically link all libraries as we can.

Bug: 151122313
Test: atest
Merged-In: I56b6774b09cd4027db268ba74b670be01e88b2eb
Change-Id: I86f9ec4db57c2164d48ec8ec272fe47af322294c
(cherry picked from commit b838c3b6f7c11adaaaec41153bd35f1990de2810)

Android.bp

diff --git a/Android.bp b/Android.bp
index 9c4bda2..3326b18 100644
--- a/Android.bp
+++ b/Android.bp
@@ -191,17 +191,17 @@
         "DnsQueryLogTest.cpp",
     ],
     shared_libs: [
-        "libbase",
         "libcrypto",
-        "libcutils",
-        "libssl",
         "libbinder_ndk",
+        "liblog",
+        "libssl",
     ],
     static_libs: [
         "dnsresolver_aidl_interface-unstable-ndk_platform",
         "netd_event_listener_interface-ndk_platform",
+        "libcutils",
+        "libbase",
         "libgmock",
-        "liblog",
         "libnetd_resolv",
         "libnetd_test_dnsresponder",
         "libnetd_test_resolv_utils",