commit 6a7d8f9ebd7a98afdec83fed198010d234001b45
author Henri Chataing <henrichataing@google.com> Tue Dec 19 22:21:15 2023 +0000
committer Henri Chataing <henrichataing@google.com> Tue Dec 19 22:31:26 2023 +0000
tree faa0b977adbe382467cf4073d764aa9436af120b
parent ca9a6ea45425a4fe1a995f84d2cee7f610a7df59

Statically link libbase for mainline module tests

b/310046696 introduced a breaking ABI change in libbase, and
the following unit tests fail to launch on previous
platforms because of missing symbols:
  - libnetworkstats_test
  - netd_updatable_unit_test

Bug: 316464217
Test: atest libnetworkstats_test
Test: atest netd_updatable_unit_test
Change-Id: Icef58de0b46c6042a9459d3d4c45ea9ce2baefed

netd/Android.bp

diff --git a/netd/Android.bp b/netd/Android.bp
index 4325d89..3cdbc97 100644
--- a/netd/Android.bp
+++ b/netd/Android.bp
@@ -69,10 +69,10 @@
         "BpfBaseTest.cpp"
     ],
     static_libs: [
+        "libbase",
         "libnetd_updatable",
     ],
     shared_libs: [
-        "libbase",
         "libcutils",
         "liblog",
         "libnetdutils",

service-t/native/libs/libnetworkstats/Android.bp

diff --git a/service-t/native/libs/libnetworkstats/Android.bp b/service-t/native/libs/libnetworkstats/Android.bp
index 0dfd0af..b9f3adb 100644
--- a/service-t/native/libs/libnetworkstats/Android.bp
+++ b/service-t/native/libs/libnetworkstats/Android.bp
@@ -73,6 +73,7 @@
         "-Wthread-safety",
     ],
     static_libs: [
+        "libbase",
         "libgmock",
         "libnetworkstats",
         "libperfetto_client_experimental",
@@ -80,7 +81,6 @@
         "perfetto_trace_protos",
     ],
     shared_libs: [
-        "libbase",
         "liblog",
         "libcutils",
         "libandroid_net",