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

Commit e39d2d9f 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 

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

Change-Id: Ib1f8c1d50a31021559bdee04115182a4d17f7006
parents 01091d8f 7350b623

StubLibraries.bp

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

        "framework-wifi.stubs",

        "private-stub-annotations-jar",

        "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: [

    defaults: [

        "android_defaults_stubs_current",

        "android_defaults_stubs_current",

        "android_stubs_dists_default",

        "android_stubs_dists_default",
@@ -362,6 +349,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 {

java_library_static {

    name: "android_system_merged_stubs_current",

    name: "android_system_merged_stubs_current",

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

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