diff --git a/Android.bp b/Android.bp
index 1112873..dacc40f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -50,13 +50,16 @@
         ".",
     ],
     apex_available: [
-        // This header lib is depended on by gwp_asan which is available to
-        // platform.
+        // This header lib is compiled also as part of the platform due to libasync_safe
+        // and others that are compiled with this header and are statically included
+        // in the platform side.
         "//apex_available:platform",
-        // GWP-ASan headers are frequently referenced by apexes that include
-        // references to libc_headers or libc_scudo. These modules manage apex
-        // visibility in Soong, and are globally visible.
-        "//apex_available:anyapex",
+        "com.android.runtime",
+        // GWP-ASan headers are currently referenced by the following additional APEXes
+        "com.android.art.debug",
+        "com.android.art.release",
+        "com.android.media",
+        "com.android.media.swcodec",
     ],
 }