commit 7b6059387d97406632f4e9e60afc0a0c778fae4b
author Ryan Prichard <rprichard@google.com> Thu May 23 01:33:48 2024 -0700
committer Ryan Prichard <rprichard@google.com> Thu May 23 02:16:48 2024 -0700
tree 8c175257fcee69620c1079e143a18f24e43b4eda
parent 4d0afab8fe28e8e6302ed9ea07c6c46bf5b741e6

Build 2 more tests with static libc++ and version script

Bug: 341216801
Bug: 342308229
Test: libnetworkstats_test netd_updatable_unit_test
Change-Id: Ic76bdd4d46bc0f7641eb10479b35f74103e6eb8e

netd/Android.bp

diff --git a/netd/Android.bp b/netd/Android.bp
index eedbdae..fe4d999 100644
--- a/netd/Android.bp
+++ b/netd/Android.bp
@@ -72,6 +72,8 @@
         "BpfHandlerTest.cpp",
         "BpfBaseTest.cpp",
     ],
+    version_script: ":connectivity_mainline_test_map",
+    stl: "libc++_static",
     static_libs: [
         "libbase",
         "libnetd_updatable",

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 c620634..b1925bd 100644
--- a/service-t/native/libs/libnetworkstats/Android.bp
+++ b/service-t/native/libs/libnetworkstats/Android.bp
@@ -76,6 +76,8 @@
         "-Wno-unused-parameter",
         "-Wthread-safety",
     ],
+    version_script: ":connectivity_mainline_test_map",
+    stl: "libc++_static",
     static_libs: [
         "libbase",
         "libgmock",