Merge "Unbundle ART API from android-non-updatable" am: 5a4fc1d6e1 am: a81a5f1bdb am: f31935f2e9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533282

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibae612368c7cedd9812925f632bfbbf5e7c844d1

StubLibraries.bp

@@ -47,7 +47,6 @@ stubs_defaults {
         "core/java/**/*.logtags",
         ":opt-telephony-srcs",
         ":opt-net-voip-srcs",
-        ":art.module.public.api{.public.stubs.source}",
         "**/package.html",
     ],
     sdk_version: "none",
@@ -243,6 +242,7 @@ java_library_static {
     name: "android_stubs_current",
     srcs: [ ":api-stubs-docs-non-updatable" ],
     static_libs: [
+        "art.module.public.api.stubs",
         "conscrypt.module.public.api.stubs",
         "framework-appsearch.stubs",
         "framework-graphics.stubs",
@@ -263,6 +263,7 @@ java_library_static {
     name: "android_system_stubs_current",
     srcs: [ ":system-api-stubs-docs-non-updatable" ],
     static_libs: [
+        "art.module.public.api.stubs",
         "conscrypt.module.public.api.stubs",
         "framework-appsearch.stubs.system",
         "framework-graphics.stubs.system",
@@ -299,6 +300,7 @@ java_library_static {
     static_libs: [
         // Modules do not have test APIs, but we want to include their SystemApis, like we include
         // the SystemApi of framework-non-updatable-sources.
+        "art.module.public.api.stubs",
         "conscrypt.module.public.api.stubs",
         "framework-appsearch.stubs.system",
         "framework-graphics.stubs.system",
@@ -337,6 +339,7 @@ java_library_static {
         "android_stubs_dists_default",
     ],
     libs: ["sdk_system_29_android"],
+    static_libs: ["art.module.public.api.stubs"],
     dist: {
         dir: "apistubs/android/module-lib",
     },

api/Android.bp

@@ -28,6 +28,7 @@ genrule {
 genrule {
     name: "frameworks-base-api-current.txt",
     srcs: [
+        ":art.module.public.api{.public.api.txt}",
         ":conscrypt.module.public.api{.public.api.txt}",
         ":framework-appsearch{.public.api.txt}",
         ":framework-graphics{.public.api.txt}",
@@ -66,6 +67,7 @@ genrule {
     name: "frameworks-base-api-current.srcjar",
     srcs: [
         ":api-stubs-docs-non-updatable",
+        ":art.module.public.api{.public.stubs.source}",
         ":conscrypt.module.public.api{.public.stubs.source}",
         ":framework-appsearch{.public.stubs.source}",
         ":framework-graphics{.public.stubs.source}",
@@ -87,6 +89,7 @@ genrule {
 genrule {
     name: "frameworks-base-api-removed.txt",
     srcs: [
+        ":art.module.public.api{.public.removed-api.txt}",
         ":conscrypt.module.public.api{.public.removed-api.txt}",
         ":framework-appsearch{.public.removed-api.txt}",
         ":framework-graphics{.public.removed-api.txt}",