gwp_asan_headers is marked as available to platformandroid-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-dev

The header lib is depended on by many of the bionic libraries which are
part of the platform.

With b/153073816, we will be checking the availability to the platform,
i.e. platform-available module depending on platform-unavailable module
causes a build error.

Prepare for the change by correctly marking that this interface lib is
available to the platform.

Also, this change narrows down the APEXes where this header lib is
available for. Instead of allowing it to be included in any APEX, the
list of APEXes that are currently using this is specified.

Bug: 153073816
Test: m
Change-Id: Ie329792936599072aaf2bc66a51b64f064baa229

1 files changed, 9 insertions, 6 deletions

diff --git a/Android.bp b/Android.bp
index 1112873..dacc40f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -50,13 +50,16 @@ cc_library_headers {
         ".",
     ],
     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",
     ],
 }