diff --git a/packages/Connectivity/framework/Android.bp b/packages/Connectivity/framework/Android.bp
index b0965bb..de71af4 100644
--- a/packages/Connectivity/framework/Android.bp
+++ b/packages/Connectivity/framework/Android.bp
@@ -141,6 +141,7 @@
         "jni/onload.cpp",
     ],
     shared_libs: ["libandroid"],
+    stl: "libc++_static",
     apex_available: [
         "//apex_available:platform",
         "com.android.tethering",
diff --git a/packages/Connectivity/service/Android.bp b/packages/Connectivity/service/Android.bp
index 37dd9ff..05a8a4e 100644
--- a/packages/Connectivity/service/Android.bp
+++ b/packages/Connectivity/service/Android.bp
@@ -36,6 +36,7 @@
         "jni/com_android_server_TestNetworkService.cpp",
         "jni/onload.cpp",
     ],
+    stl: "libc++_static",
     shared_libs: [
         "libbase",
         "liblog",