commit 2526b660fd8cd98d341f0d03eb9e1990236b4bb4
author Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 06 22:48:31 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 06 22:48:31 2022 +0000
tree 613e5b3b1e57a11d273942abf4e223e2c4d61ae1
parent 44742701c9e91b628f4802b7f4f53248ad0bb3b9
parent e78ea1fc0c5cf6b4c9ae3d140a4189fa0c55833f

Merge changes from topics "gwp-asan-headers", "native_handle_fdsan"

* changes:
  Open libasync_safe to any APEX
  Remove gwp_asan_headers from libc_defaults

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 50f8b74..b216863 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -95,7 +95,6 @@
 
     header_libs: [
         "libc_headers",
-        "gwp_asan_headers",
         "liblog_headers",  // needed by bionic/libc/async_safe/include
     ],
     export_header_lib_headers: [

libc/async_safe/Android.bp

diff --git a/libc/async_safe/Android.bp b/libc/async_safe/Android.bp
index 531317d..eb690dd 100644
--- a/libc/async_safe/Android.bp
+++ b/libc/async_safe/Android.bp
@@ -30,13 +30,8 @@
     stl: "none",
 
     apex_available: [
+        "//apex_available:anyapex",
         "//apex_available:platform",
-        "com.android.runtime",
-        "com.android.art",
-        "com.android.art.debug",
-        "com.android.media",
-        "com.android.media.swcodec",
-        "com.android.virt",
     ],
     min_sdk_version: "apex_inherit",
 }