commit b4c23597306892fbe57bd7d8f5f42cebd488c039
author Henri Chataing <henrichataing@google.com> Wed Dec 20 16:42:38 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 20 16:42:38 2023 +0000
tree b5dc1ece0be5b47684d6ff2f97b733633bd3a127
parent fe9e76e2078cf5090e731d45d449140dd936a9f2
parent 6a7d8f9ebd7a98afdec83fed198010d234001b45

Merge "Statically link libbase for mainline module tests" into main

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",