diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-03-16 02:22:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-16 02:22:21 +0000 |
| commit | e612eae02c7656c209b22a492aed0f4dda89f4db (patch) | |
| tree | 0b36b2179abd623fedb5b5efb9de768862b04bd7 | |
| parent | 4eb670c2bb6f7e266f274d5ae03580cf2e8fe246 (diff) | |
| parent | d252dbeccd6d02c3b77e47d72b17b506ddd16535 (diff) | |
| download | orchestrator-e612eae02c7656c209b22a492aed0f4dda89f4db.tar.gz | |
Merge "Move bionic contributions to runtime apex" am: 9ca15b4acf am: 238900c259 am: d252dbeccd
Original change: https://android-review.googlesource.com/c/platform/build/orchestrator/+/2493155
Change-Id: I5c248219c57fa835a7e7e8474014704b7d6e72ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | apis/Android.bp | 28 |
1 files changed, 17 insertions, 11 deletions
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 @@ api_domain { "libamidi.ndk", "libandroid.ndk", "libbinder_ndk.ndk", - "libc.ndk", "libcamera2ndk.ndk", - "libdl.ndk", "libEGL.ndk", "libGLESv1_CM.ndk", "libGLESv2.ndk", @@ -34,7 +32,6 @@ api_domain { "libicu.ndk", "libjnigraphics.ndk", "liblog.ndk", - "libm.ndk", "libnativewindow.ndk", "libOpenMAXAL.ndk", "libOpenSLES.ndk", @@ -54,10 +51,7 @@ api_domain { "libartpalette-system", "libbinder_ndk", "libbinder_rpc_unstable", - "libc", "libcgrouprc", - "libdl", - "libdl_android", "libft2", "libEGL", "libGLESv1_CM", @@ -65,7 +59,6 @@ api_domain { "libGLESv3", "libincident", "liblog", - "libm", "libmediametrics", "libmediandk", "libnativewindow", @@ -173,7 +166,7 @@ api_domain { 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 @@ api_domain { "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 { } 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", |