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

Separate out lists of modules from build rules

Browse Source 
This simplifies management of the build rules across different branches
that may have different lists of modules.

Additionally, we dedupe the list of module system stubs.

Bug: 184839225
Test: m
Change-Id: Ibef1fb686305b5b1b50811b7d1c6d677d07d7177
This commit is contained in:
Anton Hansson
2021-04-09 10:12:45 +01:00
parent 397cb14bd3
commit 33b9b855f3
1 changed files with 43 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
StubLibraries.bp
View File

@@ -271,6 +271,44 @@ 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-appsearch.stubs",
"framework-connectivity.stubs",
"framework-graphics.stubs",
"framework-media.stubs",
"framework-mediaprovider.stubs",
"framework-permission.stubs",
"framework-permission-s.stubs",
"framework-scheduling.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-appsearch.stubs.system",
"framework-connectivity.stubs.system",
"framework-graphics.stubs.system",
"framework-media.stubs.system",
"framework-mediaprovider.stubs.system",
"framework-permission.stubs.system",
"framework-permission-s.stubs.system",
"framework-scheduling.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" ],
@@ -302,23 +340,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-appsearch.stubs",
"framework-connectivity.stubs",
"framework-graphics.stubs",
"framework-media.stubs",
"framework-mediaprovider.stubs",
"framework-permission.stubs",
"framework-permission-s.stubs",
"framework-scheduling.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"],
@@ -327,23 +349,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-appsearch.stubs.system",
"framework-connectivity.stubs.system",
"framework-graphics.stubs.system",
"framework-media.stubs.system",
"framework-mediaprovider.stubs.system",
"framework-permission.stubs.system",
"framework-permission-s.stubs.system",
"framework-scheduling.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: [
@@ -366,25 +372,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-appsearch.stubs.system",
"framework-connectivity.stubs.system",
"framework-graphics.stubs.system",
"framework-media.stubs.system",
"framework-mediaprovider.stubs.system",
"framework-permission.stubs.system",
"framework-permission-s.stubs.system",
"framework-scheduling.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: [