Remove SDK dep from module_lib_api

This had the consequence of making two large metalava invocations
run in sequence rather than parallell.

For now, add back the dependency on framework-all instead. Building
framework-all should be a lot faster than the sdk stubs.

Also move the module stubs dep from framework_defaults to
framework-minus-apex. framework-all does not need this dep.

Bug: 151092414
Test: m
Test: NINJA_ARGS="-t path out/soong/.intermediates/frameworks/base/module-lib-api-stubs-docs/android_common/module-lib-api-stubs-docs-stubs.srcjar \
                          out/soong/.intermediates/frameworks/base/system-api-stubs-docs/android_common/system-api-stubs-docs-stubs.srcjar" m
Change-Id: Ifdf8823d374254e594330b43ae3a39a76c7b90c5
This commit is contained in:
Anton Hansson
2020-03-20 09:12:52 +00:00
parent 4d39f7bbe9
commit 92d79fddd4
2 changed files with 7 additions and 2 deletions

View File

@@ -418,7 +418,6 @@ java_defaults {
"app-compat-annotations",
"ext",
"unsupportedappusage",
"framework-updatable-stubs-module_libs_api",
],
jarjar_rules: ":framework-jarjar-rules",
@@ -492,6 +491,7 @@ java_library {
"services-platform-compat-config",
"documents-ui-compat-config",
],
libs: ["framework-updatable-stubs-module_libs_api"],
static_libs: [
// If MimeMap ever becomes its own APEX, then this dependency would need to be removed
// in favor of an API stubs dependency in java_library "framework" below.
@@ -545,6 +545,7 @@ java_library {
visibility: [
// DO NOT ADD ANY MORE ENTRIES TO THIS LIST
"//external/robolectric-shadows:__subpackages__",
"//frameworks/base",
"//frameworks/layoutlib:__subpackages__",
],
}

View File

@@ -79,7 +79,11 @@ stubs_defaults {
stubs_defaults {
name: "metalava-non-updatable-api-stubs-default",
defaults: ["metalava-base-api-stubs-default"],
sdk_version: "system_current",
sdk_version: "core_platform",
libs: ["framework-all"],
aidl: {
local_include_dirs: ["apex/media/framework/java"],
},
}
/////////////////////////////////////////////////////////////////////