commit 3f34064c90a19d5ba9007e3ee628c34fc150aacc
author Spandan Das <spandandas@google.com> Wed Mar 15 23:07:17 2023 +0000
committer Spandan Das <spandandas@google.com> Wed Mar 15 23:08:32 2023 +0000
tree 525d80b89b084507c6a3719654d20d444fc4ae63
parent 9e7c54dd068e206a586e0a2d90e4975d1ec67576

Move bionic contributions to runtime apex

These apis are provided by the runtime apex and not by platform. This
information is used for Multi-tree API export

(There are some formatting changes due to bpfmt)

Test: TH
Change-Id: I5896200451de0519c5f7473c75dea998e3de54a2

apis/Android.bp

diff --git a/apis/Android.bp b/apis/Android.bp
index 862afd2..b2896dc 100644
--- a/apis/Android.bp
+++ b/apis/Android.bp
@@ -24,9 +24,7 @@
         "libamidi.ndk",
         "libandroid.ndk",
         "libbinder_ndk.ndk",
-        "libc.ndk",
         "libcamera2ndk.ndk",
-        "libdl.ndk",
         "libEGL.ndk",
         "libGLESv1_CM.ndk",
         "libGLESv2.ndk",
@@ -34,7 +32,6 @@
         "libicu.ndk",
         "libjnigraphics.ndk",
         "liblog.ndk",
-        "libm.ndk",
         "libnativewindow.ndk",
         "libOpenMAXAL.ndk",
         "libOpenSLES.ndk",
@@ -54,10 +51,7 @@
         "libartpalette-system",
         "libbinder_ndk",
         "libbinder_rpc_unstable",
-        "libc",
         "libcgrouprc",
-        "libdl",
-        "libdl_android",
         "libft2",
         "libEGL",
         "libGLESv1_CM",
@@ -65,7 +59,6 @@
         "libGLESv3",
         "libincident",
         "liblog",
-        "libm",
         "libmediametrics",
         "libmediandk",
         "libnativewindow",
@@ -173,7 +166,7 @@
     name: "com.android.conscrypt.contribution",
     java_api_contributions: [
         "conscrypt.module.intra.core.api.stubs.source",
-	"conscrypt.module.platform.api.stubs.source",
+        "conscrypt.module.platform.api.stubs.source",
         "conscrypt.module.public.api.stubs.source",
         "conscrypt.module.public.api.stubs.source.module_lib",
         "conscrypt.module.public.api.stubs.source.system",
@@ -200,9 +193,9 @@
         "i18n.module.public.api.stubs.source",
         "i18n.module.public.api.stubs.source.module_lib",
         "i18n.module.public.api.stubs.source.system",
-	// i18n exports two versions of CorePlatformApi (stable and legacy)
-	"legacy.i18n.module.platform.api.stubs.source",
-	"stable.i18n.module.platform.api.stubs.source",
+        // i18n exports two versions of CorePlatformApi (stable and legacy)
+        "legacy.i18n.module.platform.api.stubs.source",
+        "stable.i18n.module.platform.api.stubs.source",
     ],
 }
 
@@ -289,6 +282,19 @@
 }
 
 api_domain {
+    name: "com.android.runtime.contribution",
+    cc_api_contributions: [
+        "libc.ndk",
+        "libdl.ndk",
+        "libm.ndk",
+        "libc",
+        "libdl",
+        "libdl_android",
+        "libm",
+    ],
+}
+
+api_domain {
     name: "com.android.scheduling.contribution",
     java_api_contributions: [
         "framework-scheduling.stubs.source",