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

Commit ffd48588 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Make non-updatable stubs depend on sdk 29" am: 477806b2 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1324166

Change-Id: I4e49215d90ea9ecfb4e346bee0b3e28e469c9986
parents d42536b3 477806b2

StubLibraries.bp

+13 −2
Original line number Diff line number Diff line
@@ -76,7 +76,18 @@ stubs_defaults { 
    name: "metalava-non-updatable-api-stubs-default",

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

    sdk_version: "core_platform",

    libs: ["framework-all"],

    // There are a few classes from modules used as type arguments that

    // need to be resolved by metalava. For now, we can use a previously

    // finalized stub library to resolve them. If a new class gets added,

    // this may be need to be revisited to use a manually maintained stub

    // library with empty classes in order to resolve those references.

    libs: ["sdk_system_29_android"],

    aidl: {

        local_include_dirs: [

            "media/apex/java",

            "wifi/aidl-export",

        ],

    },

}



/////////////////////////////////////////////////////////////////////
@@ -286,7 +297,7 @@ java_library_static { 
    name: "android_module_lib_stubs_current",

    srcs: [ ":module-lib-api-stubs-docs" ],

    defaults: ["android_defaults_stubs_current"],

    libs: ["android_system_stubs_current"],

    libs: ["sdk_system_29_android"],

}



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