Merge "Revert "Add ART module-lib and system API to the collection"" into sc-dev am: d59fb76bcb

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

Change-Id: I43ce80146b16cb55ed66f4e6271674aeb79fe79d

StubLibraries.bp

@@ -255,7 +255,7 @@ modules_public_stubs = [
 
 modules_system_stubs = [
     "android.net.ipsec.ike.stubs.system",
-    "art.module.public.api.stubs",
+    "art.module.public.api.stubs", // Only has public stubs
     "conscrypt.module.public.api.stubs", // Only has public stubs
     "framework-appsearch.stubs.system",
     "framework-connectivity.stubs.system",

api/Android.bp

@@ -161,7 +161,6 @@ genrule {
 genrule {
     name: "frameworks-base-api-system-current.txt",
     srcs: [
-        ":art.module.public.api{.system.api.txt}",
         ":android.net.ipsec.ike{.system.api.txt}",
         ":framework-appsearch{.system.api.txt}",
         ":framework-connectivity{.system.api.txt}",
@@ -216,7 +215,6 @@ genrule {
 genrule {
     name: "frameworks-base-api-system-removed.txt",
     srcs: [
-        ":art.module.public.api{.system.removed-api.txt}",
         ":android.net.ipsec.ike{.system.removed-api.txt}",
         ":framework-appsearch{.system.removed-api.txt}",
         ":framework-connectivity{.system.removed-api.txt}",
@@ -253,7 +251,6 @@ genrule {
 genrule {
     name: "frameworks-base-api-module-lib-current.txt",
     srcs: [
-        ":art.module.public.api{.module-lib.api.txt}",
         ":android.net.ipsec.ike{.module-lib.api.txt}",
         ":framework-appsearch{.module-lib.api.txt}",
         ":framework-connectivity{.module-lib.api.txt}",
@@ -310,7 +307,6 @@ genrule {
 genrule {
     name: "frameworks-base-api-module-lib-removed.txt",
     srcs: [
-        ":art.module.public.api{.module-lib.removed-api.txt}",
         ":android.net.ipsec.ike{.module-lib.removed-api.txt}",
         ":framework-appsearch{.module-lib.removed-api.txt}",
         ":framework-connectivity{.module-lib.removed-api.txt}",