Revert "Add ART module-lib and system API to the collection"
This reverts commit e06e41e35841fff0e091bae2414cbd66b5c90234.
Reason for revert: http://b/188046814
Bug: 188046814
Test: vendor/google/cts/shim/build_all_shim.sh succeded
Change-Id: Id5618d40755782a7156bd2357a436a5f46ad950a
diff --git a/StubLibraries.bp b/StubLibraries.bp
index 4d5b09f..ed24d43 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -255,7 +255,7 @@
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",
diff --git a/api/Android.bp b/api/Android.bp
index 694df0a..5b73388 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -156,7 +156,6 @@
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}",
@@ -211,7 +210,6 @@
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}",
@@ -248,7 +246,6 @@
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}",
@@ -305,7 +302,6 @@
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}",