Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ia0757f3fff7b48be9cd322f3ab7d2e5998e4f5f8
This commit is contained in:
Victor Chang
2021-05-25 11:52:39 +00:00
committed by Automerger Merge Worker
parent c200310e02 c92d1a5eb1
commit 5a3b4d0673
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
StubLibraries.bp
View File

@@ -255,7 +255,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-appsearch.stubs.system", "framework-appsearch.stubs.system",
"framework-connectivity.stubs.system", "framework-connectivity.stubs.system",

4
api/Android.bp
View File

@@ -161,6 +161,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-appsearch{.system.api.txt}", ":framework-appsearch{.system.api.txt}",
":framework-connectivity{.system.api.txt}", ":framework-connectivity{.system.api.txt}",
@@ -215,6 +216,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-appsearch{.system.removed-api.txt}", ":framework-appsearch{.system.removed-api.txt}",
":framework-connectivity{.system.removed-api.txt}", ":framework-connectivity{.system.removed-api.txt}",
@@ -251,6 +253,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-appsearch{.module-lib.api.txt}", ":framework-appsearch{.module-lib.api.txt}",
":framework-connectivity{.module-lib.api.txt}", ":framework-connectivity{.module-lib.api.txt}",
@@ -307,6 +310,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-appsearch{.module-lib.removed-api.txt}", ":framework-appsearch{.module-lib.removed-api.txt}",
":framework-connectivity{.module-lib.removed-api.txt}", ":framework-connectivity{.module-lib.removed-api.txt}",