Merge a0a8ea6c157d19312405add4c94210aa6ee80ea0 on remote branch
Change-Id: Ie8705cfc1ffd0ed5578e16ae8db2f62ec572ed44
diff --git a/Android.bp b/Android.bp
index 5fa7e11..dacc40f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -50,10 +50,16 @@
".",
],
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",
],
}