PS: test_only
diff --git a/Android.bp b/Android.bp
index 7327980..84f88ec 100644
--- a/Android.bp
+++ b/Android.bp
@@ -492,7 +492,7 @@
     header_libs: [
         "bionic_libc_platform_headers",
     ],
-    stl: "libc++",
+    stl: "libc++_static",
     version_script: "src/profiling/memory/heapprofd_client_api.map.txt",
 }
 
@@ -19694,7 +19694,7 @@
                 "libz",
                 "sqlite_ext_percentile",
             ],
-            stl: "libc++",
+            stl: "libc++_static",
             dist: {
                 targets: [
                     "sdk_repo",
diff --git a/tools/gen_android_bp b/tools/gen_android_bp
index 76c274c..dbbe4a9 100755
--- a/tools/gen_android_bp
+++ b/tools/gen_android_bp
@@ -295,7 +295,7 @@
         ('static_libs', {'libasync_safe'}),
         ('version_script', 'src/profiling/memory/heapprofd_client_api.map.txt'),
         ('export_include_dirs', {'src/profiling/memory/include'}),
-        ('stl', 'libc++'),
+        ('stl', 'libc++_static'),
     ],
     'perfetto_unittests': [
         ('data', set(enumerate_data_deps())),
@@ -315,7 +315,7 @@
             'all': True
         }),
         ('host', {
-            'stl': 'libc++',
+            'stl': 'libc++_static',
             'dist': {
                 'targets': ['sdk_repo']
             },