Merge "Add ART module-lib and system API to the collection" am: 0799624dc7

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

Change-Id: I13fa04aa6c0a16bb71534c454d9c9a741927f718
This commit is contained in:
vichang
2021-05-19 12:48:32 +00:00
committed by Automerger Merge Worker
2 changed files with 5 additions and 1 deletions

View File

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

View File

@@ -149,6 +149,7 @@ genrule {
genrule { genrule {
name: "frameworks-base-api-system-current.txt", name: "frameworks-base-api-system-current.txt",
srcs: [ srcs: [
":art.module.public.api{.system.api.txt}",
":android.net.ipsec.ike{.system.api.txt}", ":android.net.ipsec.ike{.system.api.txt}",
":framework-connectivity{.system.api.txt}", ":framework-connectivity{.system.api.txt}",
":framework-media{.system.api.txt}", ":framework-media{.system.api.txt}",
@@ -199,6 +200,7 @@ genrule {
genrule { genrule {
name: "frameworks-base-api-system-removed.txt", name: "frameworks-base-api-system-removed.txt",
srcs: [ srcs: [
":art.module.public.api{.system.removed-api.txt}",
":android.net.ipsec.ike{.system.removed-api.txt}", ":android.net.ipsec.ike{.system.removed-api.txt}",
":framework-connectivity{.system.removed-api.txt}", ":framework-connectivity{.system.removed-api.txt}",
":framework-media{.system.removed-api.txt}", ":framework-media{.system.removed-api.txt}",
@@ -231,6 +233,7 @@ genrule {
genrule { genrule {
name: "frameworks-base-api-module-lib-current.txt", name: "frameworks-base-api-module-lib-current.txt",
srcs: [ srcs: [
":art.module.public.api{.module-lib.api.txt}",
":android.net.ipsec.ike{.module-lib.api.txt}", ":android.net.ipsec.ike{.module-lib.api.txt}",
":framework-connectivity{.module-lib.api.txt}", ":framework-connectivity{.module-lib.api.txt}",
":framework-media{.module-lib.api.txt}", ":framework-media{.module-lib.api.txt}",
@@ -283,6 +286,7 @@ genrule {
genrule { genrule {
name: "frameworks-base-api-module-lib-removed.txt", name: "frameworks-base-api-module-lib-removed.txt",
srcs: [ srcs: [
":art.module.public.api{.module-lib.removed-api.txt}",
":android.net.ipsec.ike{.module-lib.removed-api.txt}", ":android.net.ipsec.ike{.module-lib.removed-api.txt}",
":framework-connectivity{.module-lib.removed-api.txt}", ":framework-connectivity{.module-lib.removed-api.txt}",
":framework-media{.module-lib.removed-api.txt}", ":framework-media{.module-lib.removed-api.txt}",