commit db537e58671a24d636591b9415c11b97e463366e
author Ryan Prichard <rprichard@google.com> Thu May 23 10:38:38 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 23 10:38:38 2024 +0000
tree 8c175257fcee69620c1079e143a18f24e43b4eda
parent 8555c14c44bc2a9f4a637201f91113c1be005633
parent 7b6059387d97406632f4e9e60afc0a0c778fae4b

Build 2 more tests with static libc++ and version script am: 7b6059387d

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3098866

Change-Id: I0e1224e499fed00e26e1a90f3bb9298c7d8397ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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