Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "For metalava target, use droidstubs instead of droiddoc"

Browse Source 
am: 5eb84c0065

Change-Id: Iae290fe3c3e6eaf4fda9675bd92e73da87ebd668
This commit is contained in:
Nan Zhang
2018-09-12 13:43:55 -07:00
committed by android-build-merger
parent b8903776dc 5eb84c0065
commit b910944852
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Android.bp
View File

@@ -1207,7 +1207,7 @@ metalava_framework_docs_args = "--manifest $(location core/res/AndroidManifest.x
"--hide HiddenSuperclass --hide DeprecationMismatch --hide UnavailableSymbol " + "--hide HiddenSuperclass --hide DeprecationMismatch --hide UnavailableSymbol " +
"--hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo" "--hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo"
doc_defaults { stubs_defaults {
name: "metalava-api-stubs-default", name: "metalava-api-stubs-default",
srcs: [ srcs: [
":opt-telephony-srcs", ":opt-telephony-srcs",
@@ -1232,10 +1232,9 @@ doc_defaults {
], ],
local_sourcepaths: frameworks_base_subdirs, local_sourcepaths: frameworks_base_subdirs,
installable: false, installable: false,
metalava_enabled: true, annotations_enabled: true,
metalava_annotations_enabled: true, previous_api: ":last-released-public-api",
metalava_previous_api: ":last-released-public-api", merge_annotations_dirs: [
metalava_merge_annotations_dirs: [
"metalava-manual", "metalava-manual",
"ojluni-annotated-stubs", "ojluni-annotated-stubs",
], ],
@@ -1467,7 +1466,7 @@ java_library_static {
], ],
} }
droiddoc { droidstubs {
name: "hiddenapi-lists-docs", name: "hiddenapi-lists-docs",
defaults: ["metalava-api-stubs-default"], defaults: ["metalava-api-stubs-default"],
arg_files: [ arg_files: [
@@ -1526,7 +1525,7 @@ filegroup {
], ],
} }
droiddoc { droidstubs {
name: "api-stubs-docs", name: "api-stubs-docs",
defaults: ["metalava-api-stubs-default"], defaults: ["metalava-api-stubs-default"],
api_filename: "public_api.txt", api_filename: "public_api.txt",
@@ -1548,7 +1547,7 @@ droiddoc {
}, },
} }
droiddoc { droidstubs {
name: "system-api-stubs-docs", name: "system-api-stubs-docs",
defaults: ["metalava-api-stubs-default"], defaults: ["metalava-api-stubs-default"],
api_tag_name: "SYSTEM", api_tag_name: "SYSTEM",
@@ -1572,7 +1571,7 @@ droiddoc {
}, },
} }
droiddoc { droidstubs {
name: "test-api-stubs-docs", name: "test-api-stubs-docs",
defaults: ["metalava-api-stubs-default"], defaults: ["metalava-api-stubs-default"],
api_tag_name: "TEST", api_tag_name: "TEST",