diff options
| author | Anton Hansson <hansson@google.com> | 2020-03-20 09:12:52 +0000 |
|---|---|---|
| committer | Anton Hansson <hansson@google.com> | 2020-03-20 09:24:15 +0000 |
| commit | 92d79fddd49b1b502f0b47c574fb1aec7ca85b15 (patch) | |
| tree | 53ef423a12ed22b4e2cb43fba278233f9ee84b37 | |
| parent | 4d39f7bbe981115f48efa8aa3f9ae750d4a5378d (diff) | |
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
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | StubLibraries.bp | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp index 48d955955425..ce2729d361af 100644 --- a/Android.bp +++ b/Android.bp @@ -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__", ], } diff --git a/StubLibraries.bp b/StubLibraries.bp index da9f1654d60f..68e1b1b2872f 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -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"], + }, } ///////////////////////////////////////////////////////////////////// |