Merge "Remove obsolete droidstub args" am: 8b9e50c2b3

Change-Id: I44377e54e72a3b2cfb675f4fa24077b9c669586b
This commit is contained in:
Anton Hansson
2020-04-23 10:16:25 +00:00
committed by Automerger Merge Worker
3 changed files with 0 additions and 15 deletions

View File

@@ -86,9 +86,6 @@ stubs_defaults {
droidstubs { droidstubs {
name: "api-stubs-docs", name: "api-stubs-docs",
defaults: ["metalava-full-api-stubs-default"], 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", removed_dex_api_filename: "removed-dex.txt",
arg_files: [ arg_files: [
"core/res/AndroidManifest.xml", "core/res/AndroidManifest.xml",
@@ -131,10 +128,6 @@ module_libs = " " +
droidstubs { droidstubs {
name: "system-api-stubs-docs", name: "system-api-stubs-docs",
defaults: ["metalava-full-api-stubs-default"], 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", removed_dex_api_filename: "system-removed-dex.txt",
arg_files: [ arg_files: [
"core/res/AndroidManifest.xml", "core/res/AndroidManifest.xml",
@@ -167,9 +160,6 @@ droidstubs {
droidstubs { droidstubs {
name: "test-api-stubs-docs", name: "test-api-stubs-docs",
defaults: ["metalava-full-api-stubs-default"], defaults: ["metalava-full-api-stubs-default"],
api_tag_name: "TEST",
api_filename: "test-api.txt",
removed_api_filename: "test-removed.txt",
arg_files: [ arg_files: [
"core/res/AndroidManifest.xml", "core/res/AndroidManifest.xml",
], ],
@@ -205,7 +195,6 @@ droidstubs {
droidstubs { droidstubs {
name: "module-lib-api", name: "module-lib-api",
defaults: ["metalava-full-api-stubs-default"], defaults: ["metalava-full-api-stubs-default"],
api_tag_name: "MODULE_LIB",
arg_files: ["core/res/AndroidManifest.xml"], arg_files: ["core/res/AndroidManifest.xml"],
args: metalava_framework_docs_args + module_libs, args: metalava_framework_docs_args + module_libs,

View File

@@ -28,9 +28,6 @@ droiddoc {
installable: false, installable: false,
args: "-stubpackages com.android.uiautomator.core:" + args: "-stubpackages com.android.uiautomator.core:" +
"com.android.uiautomator.testrunner", "com.android.uiautomator.testrunner",
api_tag_name: "UIAUTOMATOR",
api_filename: "uiautomator_api.txt",
removed_api_filename: "uiautomator_removed_api.txt",
check_api: { check_api: {
current: { current: {

View File

@@ -106,7 +106,6 @@ droidstubs {
name: "services-stubs.sources", name: "services-stubs.sources",
srcs: [":services-sources"], srcs: [":services-sources"],
installable: false, installable: false,
api_tag_name: "SYSTEM_SERVER",
args: " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.SYSTEM_SERVER\\)" + args: " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.SYSTEM_SERVER\\)" +
" --hide-annotation android.annotation.Hide" + " --hide-annotation android.annotation.Hide" +
" --hide InternalClasses" + // com.android.* classes are okay in this interface " --hide InternalClasses" + // com.android.* classes are okay in this interface