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

Commit 74ac03aa authored by Liz Kammer's avatar Liz Kammer Committed by Automerger Merge Worker
Browse files

Merge "Convert uiautomator-stubs-docs to use metalava" am: 0a35d9f7 am: 2f47f7ec am: 17ab9a94 

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

Change-Id: Ieef0d06130faaddb10eee97e9efe0ca1a5bcd733
parents 35d1fb2a 17ab9a94

cmds/uiautomator/api/current.txt

+195 −194

File changed.

Preview size limit exceeded, changes collapsed.

cmds/uiautomator/api/removed.txt

+1 −0
Original line number Original line Diff line number Diff line 
// Signature format: 2.0

cmds/uiautomator/library/Android.bp

+23 −7
Original line number Original line Diff line number Diff line
@@ -12,8 +12,8 @@ 
// See the License for the specific language governing permissions and

// See the License for the specific language governing permissions and

// limitations under the License.

// limitations under the License.





droiddoc {

droidstubs {

    name: "uiautomator-stubs-docs",

    name: "uiautomator-stubs",

    srcs: [

    srcs: [

        "core-src/**/*.java",

        "core-src/**/*.java",

        "testrunner-src/**/*.java",

        "testrunner-src/**/*.java",
@@ -24,10 +24,10 @@ droiddoc { 
        "android.test.base",

        "android.test.base",

        "unsupportedappusage",

        "unsupportedappusage",

    ],

    ],

    custom_template: "droiddoc-templates-sdk",

    installable: false,

    installable: false,

    args: "-stubpackages com.android.uiautomator.core:" +

    flags: [

          "com.android.uiautomator.testrunner",

        "-stubpackages com.android.uiautomator.core:com.android.uiautomator.testrunner",

    ],





    check_api: {

    check_api: {

        current: {

        current: {
@@ -41,10 +41,26 @@ droiddoc { 
    },

    },

}

}





droiddoc {

    name: "uiautomator-stubs-docs",

    srcs: [

        ":uiautomator-stubs",

    ],

    libs: [

        "android.test.runner",

        "junit",

        "android.test.base",

        "unsupportedappusage",

    ],

    installable: false,

    custom_template: "droiddoc-templates-sdk",

    create_stubs: false,

}



java_library_static {

java_library_static {

    name: "android_uiautomator",

    name: "android_uiautomator",

    srcs: [

    srcs: [

        ":uiautomator-stubs-docs",

        ":uiautomator-stubs",

    ],

    ],

    libs: [

    libs: [

        "android.test.runner",

        "android.test.runner",
@@ -64,7 +80,7 @@ java_library_static { 
    ],

    ],

    static_libs: [

    static_libs: [

        "junit",

        "junit",

    ]

    ],

}

}





java_library_static {

java_library_static {