commit 19aca4ce281b9908c7af7d6e9c9daf2ca4792a19
author Yang Sun <sunytt@google.com> Thu May 23 10:48:46 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 23 10:48:46 2024 +0000
tree 1eb756ab98dde40c1de82a4ded7f453af2e2abae
parent 7b6059387d97406632f4e9e60afc0a0c778fae4b
parent d4ed49c770c22a0463d62c921ed144dcf5277fc4

Merge "Update checkOnHandlerThread()" into main

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