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

Commit 2a2108e7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix disting of android_system.jar" am: 0206a453 am: fad6403b am:... 

Merge "Fix disting of android_system.jar" am: 0206a453 am: fad6403b am: 52944106 am: 08290119

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

Change-Id: I5e0f69aa407d52dc41f163c9d3671baf6e21153b
parents 81708a45 08290119

StubLibraries.bp

+16 −16
Original line number Diff line number Diff line
@@ -252,21 +252,7 @@ java_library_static { 
        "framework-wifi.stubs",

        "private-stub-annotations-jar",

    ],

    defaults: [

        "android_defaults_stubs_current",

        "android_stubs_dists_default",

    ],

    dist: {

        dir: "apistubs/android/system",

    },

    dists: [

        {

            // Legacy dist path

            targets: ["sdk", "win_sdk"],

            tag: ".jar",

            dest: "android_system.jar",

        },

    ],

    defaults: ["android_defaults_stubs_current"],

}



java_library_static {
@@ -285,7 +271,21 @@ java_library_static { 
        "framework-wifi.stubs.system",

        "private-stub-annotations-jar",

    ],

    defaults: ["android_defaults_stubs_current"],

    defaults: [

        "android_defaults_stubs_current",

        "android_stubs_dists_default",

    ],

    dist: {

        dir: "apistubs/android/system",

    },

    dists: [

        {

            // Legacy dist path

            targets: ["sdk", "win_sdk"],

            tag: ".jar",

            dest: "android_system.jar",

        },

    ],

}



java_library_static {