From 7b6059387d97406632f4e9e60afc0a0c778fae4b Mon Sep 17 00:00:00 2001
From: Ryan Prichard <rprichard@google.com>
Date: Thu, 23 May 2024 01:33:48 -0700
Subject: [PATCH] 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                                  | 2 ++
 service-t/native/libs/libnetworkstats/Android.bp | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/netd/Android.bp b/netd/Android.bp
index eedbdae504..fe4d999303 100644
--- a/netd/Android.bp
+++ b/netd/Android.bp
@@ -72,6 +72,8 @@ cc_test {
         "BpfHandlerTest.cpp",
         "BpfBaseTest.cpp",
     ],
+    version_script: ":connectivity_mainline_test_map",
+    stl: "libc++_static",
     static_libs: [
         "libbase",
         "libnetd_updatable",
diff --git a/service-t/native/libs/libnetworkstats/Android.bp b/service-t/native/libs/libnetworkstats/Android.bp
index c62063404a..b1925bdafc 100644
--- a/service-t/native/libs/libnetworkstats/Android.bp
+++ b/service-t/native/libs/libnetworkstats/Android.bp
@@ -76,6 +76,8 @@ cc_test {
         "-Wno-unused-parameter",
         "-Wthread-safety",
     ],
+    version_script: ":connectivity_mainline_test_map",
+    stl: "libc++_static",
     static_libs: [
         "libbase",
         "libgmock",