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

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

Revert "Add bp-based disting of android stubs" am: 9b0a74f0 am: ef59d8ff am: 7bdd9fbd 

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

Change-Id: I7b7cde662cdab0862de3b849293f942d1eb9cb2b
parents 44df6d7e 7bdd9fbd

StubLibraries.bp

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

    compile_dex: true,

}

}





java_defaults {

    name: "android_stubs_dists_default",

    dist: {

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

        tag: ".jar",

        dest: "android.jar",

    },

}



java_library_static {

java_library_static {

    name: "android_monolith_stubs_current",

    name: "android_monolith_stubs_current",

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

    srcs: [ ":api-stubs-docs" ],
@@ -355,21 +346,7 @@ java_library_static { 
    name: "android_system_monolith_stubs_current",

    name: "android_system_monolith_stubs_current",

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

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

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

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

    defaults: [

    defaults: ["android_defaults_stubs_current"],

        "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 {

java_library_static {
@@ -401,34 +378,14 @@ java_library_static { 
    name: "android_test_stubs_current",

    name: "android_test_stubs_current",

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

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

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

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

    defaults: [

    defaults: ["android_defaults_stubs_current"],

        "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 {

java_library_static {

    name: "android_module_lib_stubs_current",

    name: "android_module_lib_stubs_current",

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

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

    defaults: [

    defaults: ["android_defaults_stubs_current"],

        "android_defaults_stubs_current",

        "android_stubs_dists_default",

    ],

    libs: ["sdk_system_29_android"],

    libs: ["sdk_system_29_android"],

    dist: {

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

    },

}

}





java_library_static {

java_library_static {

services/Android.bp

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




java_library {

java_library {

    name: "android_system_server_stubs_current",

    name: "android_system_server_stubs_current",

    defaults: ["android_stubs_dists_default"],

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

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

    installable: false,

    installable: false,

    static_libs: ["android_module_lib_stubs_current"],

    static_libs: ["android_module_lib_stubs_current"],

    sdk_version: "none",

    sdk_version: "none",

    system_modules: "none",

    system_modules: "none",

    java_version: "1.8",

    java_version: "1.8",

    dist: {

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

    },

}
 
}