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

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

Merge "Add bp-based disting of android stubs" into rvc-dev-plus-aosp am:... 

Merge "Add bp-based disting of android stubs" into rvc-dev-plus-aosp am: c9de0dd4 am: b897b0b7 am: 83dff5f9

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

Change-Id: I07e4e5a9b0cbc65b72f29bf8ba138635ffaadf85
parents 9431d98d 83dff5f9

StubLibraries.bp

+46 −3
Original line number Diff line number Diff line
@@ -311,6 +311,15 @@ java_defaults { 
    compile_dex: true,

}



java_defaults {

    name: "android_stubs_dists_default",

    dist: {

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

        tag: ".jar",

        dest: "android.jar",

    },

}



java_library_static {

    name: "android_monolith_stubs_current",

    srcs: [ ":api-stubs-docs" ],
@@ -346,7 +355,21 @@ 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"],

    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 {
@@ -378,14 +401,34 @@ java_library_static { 
    name: "android_test_stubs_current",

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

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

    defaults: ["android_defaults_stubs_current"],

    defaults: [

        "android_defaults_stubs_current",

        "android_stubs_dists_default",

    ],

    dist: {

        dir: "apistubs/android/test",

    },

    dists: [

        {

            // Legacy dist path

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

            tag: ".jar",

            dest: "android_test.jar",

        },

    ],

}



java_library_static {

    name: "android_module_lib_stubs_current",

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

    defaults: ["android_defaults_stubs_current"],

    defaults: [

        "android_defaults_stubs_current",

        "android_stubs_dists_default",

    ],

    libs: ["sdk_system_29_android"],

    dist: {

        dir: "apistubs/android/module-lib",

    },

}



java_library_static {

services/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -154,10 +154,14 @@ droidstubs { 


java_library {

    name: "android_system_server_stubs_current",

    defaults: ["android_stubs_dists_default"],

    srcs: [":services-stubs.sources"],

    installable: false,

    static_libs: ["android_module_lib_stubs_current"],

    sdk_version: "none",

    system_modules: "none",

    java_version: "1.8",

    dist: {

        dir: "apistubs/android/system-server",

    },

}