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

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

Merge "Make non-updatable stubs depend on sdk 29" into rvc-dev am: d42b7dd9 am: 5d06991b

Change-Id: I14fab1054a9447b265c68e66e8501164cdc9d51f
parents 60920949 5d06991b
Loading
Loading
Loading
Loading
+8 −3
Original line number Diff line number Diff line
@@ -76,9 +76,14 @@ 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: ["apex/media/framework/java"],
        local_include_dirs: ["apex/media/aidl/stable"],
    },
}

@@ -293,7 +298,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"],
}

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