Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e53bec05 authored by Anton Hansson's avatar Anton Hansson
Browse files

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
Merged-In: Ifdf8823d374254e594330b43ae3a39a76c7b90c5
(cherry picked from commit 92d79fdd)
parent 7f69e09d

Android.bp

+2 −1
Original line number Original line Diff line number Diff line
@@ -409,7 +409,6 @@ java_defaults { 
        "app-compat-annotations",

        "app-compat-annotations",

        "ext",

        "ext",

        "unsupportedappusage",

        "unsupportedappusage",

        "framework-updatable-stubs-module_libs_api",

    ],

    ],





    jarjar_rules: ":framework-jarjar-rules",

    jarjar_rules: ":framework-jarjar-rules",
@@ -475,6 +474,7 @@ java_library { 
        "libcore-platform-compat-config",

        "libcore-platform-compat-config",

        "services-platform-compat-config",

        "services-platform-compat-config",

    ],

    ],

    libs: ["framework-updatable-stubs-module_libs_api"],

    static_libs: [

    static_libs: [

        // If MimeMap ever becomes its own APEX, then this dependency would need to be removed

        // 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.

        // in favor of an API stubs dependency in java_library "framework" below.
@@ -519,6 +519,7 @@ java_library { 
    visibility: [

    visibility: [

        // DO NOT ADD ANY MORE ENTRIES TO THIS LIST

        // DO NOT ADD ANY MORE ENTRIES TO THIS LIST

        "//external/robolectric-shadows:__subpackages__",

        "//external/robolectric-shadows:__subpackages__",

        "//frameworks/base",

        "//frameworks/layoutlib:__subpackages__",

        "//frameworks/layoutlib:__subpackages__",

    ],

    ],

}

}

StubLibraries.bp

+2 −1
Original line number Original line Diff line number Diff line
@@ -71,7 +71,8 @@ stubs_defaults { 
stubs_defaults {

stubs_defaults {

    name: "metalava-non-updatable-api-stubs-default",

    name: "metalava-non-updatable-api-stubs-default",

    defaults: ["metalava-base-api-stubs-default"],

    defaults: ["metalava-base-api-stubs-default"],

    sdk_version: "system_current",

    sdk_version: "core_platform",

    libs: ["framework-all"],

}

}





/////////////////////////////////////////////////////////////////////

/////////////////////////////////////////////////////////////////////