commit 313bba7897709b0b75866e5672b379c4965090fb
author android-build-team Robot <android-build-team-robot@google.com> Fri May 01 07:00:22 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri May 01 07:00:22 2020 +0000
tree 51043f1f4e295d325432126dbe101311e3f2c714
parent 97ee3699592c759ef9f7447f7a6beed5f2e18064
parent a43518894bb64e0928e446297c45343214ec4c0a

Snap for 6450912 from a43518894bb64e0928e446297c45343214ec4c0a to mainline-release

Change-Id: I4e574b979fbe7c79ba92e8cbd62ec399f03d4bfc

Android.bp

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",
     ],
 }