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

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

Merge "Rename and move stub defaults to modules/common" am: 373a2703 am:... 

Merge "Rename and move stub defaults to modules/common" am: 373a2703 am: 3d7a4355 am: 25adb032

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

Change-Id: I0a4eb4cf84973274920b4614f8eac63db38b7551
parents 1b2c6656 25adb032

StubLibraries.bp

+4 −14
Original line number Diff line number Diff line
@@ -402,16 +402,6 @@ java_library_static { 
    },

}



java_defaults {

    name: "android_defaults_stubs_current",

    sdk_version: "none",

    system_modules: "none",

    java_version: "1.8",

    compile_dex: true,

    defaults_visibility: ["//visibility:private"],

    visibility: ["//visibility:public"],

}



java_defaults {

    name: "android_stubs_dists_default",

    dist: {
@@ -431,7 +421,7 @@ java_library_static { 
        "android-non-updatable.stubs",

        "private-stub-annotations-jar",

    ],

    defaults: ["android_defaults_stubs_current"],

    defaults: ["android.jar_defaults"],

}



java_library_static {
@@ -441,7 +431,7 @@ java_library_static { 
        "private-stub-annotations-jar",

    ],

    defaults: [

        "android_defaults_stubs_current",

        "android.jar_defaults",

        "android_stubs_dists_default",

    ],

    dist: {
@@ -469,7 +459,7 @@ java_library_static { 
        "private-stub-annotations-jar",

    ],

    defaults: [

        "android_defaults_stubs_current",

        "android.jar_defaults",

        "android_stubs_dists_default",

    ],

    dist: {
@@ -480,7 +470,7 @@ java_library_static { 
java_library_static {

    name: "android_module_lib_stubs_current",

    defaults: [

        "android_defaults_stubs_current",

        "android.jar_defaults",

        "android_stubs_dists_default",

    ],

    static_libs: [