diff --git a/framework/Android.bp b/framework/Android.bp
index b0965bb44b..de71af49f8 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -141,6 +141,7 @@ cc_library_shared {
         "jni/onload.cpp",
     ],
     shared_libs: ["libandroid"],
+    stl: "libc++_static",
     apex_available: [
         "//apex_available:platform",
         "com.android.tethering",
diff --git a/service/Android.bp b/service/Android.bp
index 37dd9ff84b..05a8a4eec5 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -36,6 +36,7 @@ cc_library_shared {
         "jni/com_android_server_TestNetworkService.cpp",
         "jni/onload.cpp",
     ],
+    stl: "libc++_static",
     shared_libs: [
         "libbase",
         "liblog",