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

Merge "Separate out lists of modules from build rules"

Browse Source
This commit is contained in:
Anton Hansson
2021-04-09 15:34:36 +00:00
committed by Gerrit Code Review
parent 779b5f6308 6603593474
commit 6b35a8ac47
1 changed files with 35 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
StubLibraries.bp
View File

@@ -268,6 +268,36 @@ droidstubs {
// from stub sources // from stub sources
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
modules_public_stubs = [
"android.net.ipsec.ike.stubs",
"art.module.public.api.stubs",
"conscrypt.module.public.api.stubs",
"framework-connectivity.stubs",
"framework-media.stubs",
"framework-mediaprovider.stubs",
"framework-permission.stubs",
"framework-sdkextensions.stubs",
"framework-statsd.stubs",
"framework-tethering.stubs",
"framework-wifi.stubs",
"i18n.module.public.api.stubs",
]
modules_system_stubs = [
"android.net.ipsec.ike.stubs.system",
"art.module.public.api.stubs", // Only has public stubs
"conscrypt.module.public.api.stubs", // Only has public stubs
"framework-connectivity.stubs.system",
"framework-media.stubs.system",
"framework-mediaprovider.stubs.system",
"framework-permission.stubs.system",
"framework-sdkextensions.stubs.system",
"framework-statsd.stubs.system",
"framework-tethering.stubs.system",
"framework-wifi.stubs.system",
"i18n.module.public.api.stubs", // Only has public stubs
]
java_defaults { java_defaults {
name: "android_defaults_stubs_current", name: "android_defaults_stubs_current",
libs: [ "stub-annotations" ], libs: [ "stub-annotations" ],
@@ -299,19 +329,7 @@ java_defaults {
java_library_static { java_library_static {
name: "android_stubs_current", name: "android_stubs_current",
srcs: [ ":api-stubs-docs-non-updatable" ], srcs: [ ":api-stubs-docs-non-updatable" ],
static_libs: [ static_libs: modules_public_stubs + [
"android.net.ipsec.ike.stubs",
"art.module.public.api.stubs",
"conscrypt.module.public.api.stubs",
"framework-connectivity.stubs",
"framework-media.stubs",
"framework-mediaprovider.stubs",
"framework-permission.stubs",
"framework-sdkextensions.stubs",
"framework-statsd.stubs",
"framework-tethering.stubs",
"framework-wifi.stubs",
"i18n.module.public.api.stubs",
"private-stub-annotations-jar", "private-stub-annotations-jar",
], ],
defaults: ["android_defaults_stubs_current"], defaults: ["android_defaults_stubs_current"],
@@ -320,19 +338,7 @@ java_library_static {
java_library_static { java_library_static {
name: "android_system_stubs_current", name: "android_system_stubs_current",
srcs: [ ":system-api-stubs-docs-non-updatable" ], srcs: [ ":system-api-stubs-docs-non-updatable" ],
static_libs: [ static_libs: modules_system_stubs + [
"android.net.ipsec.ike.stubs.system",
"art.module.public.api.stubs",
"conscrypt.module.public.api.stubs",
"framework-connectivity.stubs.system",
"framework-media.stubs.system",
"framework-mediaprovider.stubs.system",
"framework-permission.stubs.system",
"framework-sdkextensions.stubs.system",
"framework-statsd.stubs.system",
"framework-tethering.stubs.system",
"framework-wifi.stubs.system",
"i18n.module.public.api.stubs",
"private-stub-annotations-jar", "private-stub-annotations-jar",
], ],
defaults: [ defaults: [
@@ -355,21 +361,9 @@ java_library_static {
java_library_static { java_library_static {
name: "android_test_stubs_current", name: "android_test_stubs_current",
srcs: [ ":test-api-stubs-docs-non-updatable" ], srcs: [ ":test-api-stubs-docs-non-updatable" ],
static_libs: [ // Modules do not have test APIs, but we want to include their SystemApis, like we include
// Modules do not have test APIs, but we want to include their SystemApis, like we include // the SystemApi of framework-non-updatable-sources.
// the SystemApi of framework-non-updatable-sources. static_libs: modules_system_stubs + [
"android.net.ipsec.ike.stubs.system",
"art.module.public.api.stubs",
"conscrypt.module.public.api.stubs",
"framework-connectivity.stubs.system",
"framework-media.stubs.system",
"framework-mediaprovider.stubs.system",
"framework-permission.stubs.system",
"framework-sdkextensions.stubs.system",
"framework-statsd.stubs.system",
"framework-tethering.stubs.system",
"framework-wifi.stubs.system",
"i18n.module.public.api.stubs",
"private-stub-annotations-jar", "private-stub-annotations-jar",
], ],
defaults: [ defaults: [