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

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

Merge "Dist merged jar instead of monolithic one" am: 7350b623 am:... 

Merge "Dist merged jar instead of monolithic one" am: 7350b623 am: e39d2d9f am: cd873a87 am: 0760665a

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

Change-Id: Ib2598301fce47c845953a66d8a74d78a2b1bcd5d
parents 2b0697c2 0760665a

StubLibraries.bp

+15 −13
Original line number Diff line number Diff line
@@ -338,19 +338,6 @@ java_library_static { 
        "framework-wifi.stubs",

        "private-stub-annotations-jar",

    ],

    defaults: ["android_defaults_stubs_current"],

}



java_library_static {

    name: "android_stubs_current",

    static_libs: ["android_merged_stubs_current"],

    defaults: ["android_defaults_stubs_current"],

}



java_library_static {

    name: "android_system_monolith_stubs_current",

    srcs: [ ":system-api-stubs-docs" ],

    static_libs: [ "private-stub-annotations-jar" ],

    defaults: [

        "android_defaults_stubs_current",

        "android_stubs_dists_default",
@@ -368,6 +355,21 @@ java_library_static { 
    ],

}



java_library_static {

    name: "android_stubs_current",

    static_libs: ["android_merged_stubs_current"],

    defaults: ["android_defaults_stubs_current"],

}



java_library_static {

    name: "android_system_monolith_stubs_current",

    srcs: [ ":system-api-stubs-docs" ],

    static_libs: [ "private-stub-annotations-jar" ],

    defaults: [

        "android_defaults_stubs_current",

    ],

}



java_library_static {

    name: "android_system_merged_stubs_current",

    srcs: [ ":system-api-stubs-docs-non-updatable" ],