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

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

Merge "Remove obsolete droidstub args" into rvc-dev am: 19f58926 am: f28c32e1 

Change-Id: I3d9c8e7e909f45a00a97898eca8c431233964f97
parents aea2b844 f28c32e1

StubLibraries.bp

+0 −11
Original line number Diff line number Diff line
@@ -98,9 +98,6 @@ stubs_defaults { 
droidstubs {

    name: "api-stubs-docs",

    defaults: ["metalava-full-api-stubs-default"],

    api_filename: "public_api.txt",

    private_api_filename: "private.txt",

    removed_api_filename: "removed.txt",

    removed_dex_api_filename: "removed-dex.txt",

    arg_files: [

        "core/res/AndroidManifest.xml",
@@ -143,10 +140,6 @@ module_libs = " " + 
droidstubs {

    name: "system-api-stubs-docs",

    defaults: ["metalava-full-api-stubs-default"],

    api_tag_name: "SYSTEM",

    api_filename: "system-api.txt",

    private_api_filename: "system-private.txt",

    removed_api_filename: "system-removed.txt",

    removed_dex_api_filename: "system-removed-dex.txt",

    arg_files: [

        "core/res/AndroidManifest.xml",
@@ -179,9 +172,6 @@ droidstubs { 
droidstubs {

    name: "test-api-stubs-docs",

    defaults: ["metalava-full-api-stubs-default"],

    api_tag_name: "TEST",

    api_filename: "test-api.txt",

    removed_api_filename: "test-removed.txt",

    arg_files: [

        "core/res/AndroidManifest.xml",

    ],
@@ -217,7 +207,6 @@ droidstubs { 
droidstubs {

    name: "module-lib-api",

    defaults: ["metalava-full-api-stubs-default"],

    api_tag_name: "MODULE_LIB",

    arg_files: ["core/res/AndroidManifest.xml"],

    args: metalava_framework_docs_args + module_libs,

cmds/uiautomator/library/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -28,9 +28,6 @@ droiddoc { 
    installable: false,

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

          "com.android.uiautomator.testrunner",

    api_tag_name: "UIAUTOMATOR",

    api_filename: "uiautomator_api.txt",

    removed_api_filename: "uiautomator_removed_api.txt",



    check_api: {

        current: {

services/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ droidstubs { 
    name: "services-stubs.sources",

    srcs: [":services-all-sources"],

    installable: false,

    api_tag_name: "SYSTEM_SERVER",

    args: " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.SYSTEM_SERVER\\)" +

        " --hide-annotation android.annotation.Hide" +

        " --hide InternalClasses" + // com.android.* classes are okay in this interface