Snap for 6454413 from 6c12a1494a7e503ec5d6803df480a24b28e2a67c to rvc-d1-releaseandroid-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-release

Change-Id: I0e9380a56780cc944ab84ddda615fcdf0a9a6541

1 files changed, 10 insertions, 4 deletions

diff --git a/Android.bp b/Android.bp
index 5fa7e11..dacc40f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -50,10 +50,16 @@ cc_library_headers {
         ".",
     ],
     apex_available: [
-        // 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",
+        // 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",
+        "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",
     ],
 }