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

Merge "Use Metalava to get SDK metadata for devtools" into qt-dev

Browse Source 
am: 28332d5218

Change-Id: Ic223574542472b2d6f61d48d52d02aebb432b239
This commit is contained in:
Jerome Gaillard
2019-11-19 04:25:54 -08:00
committed by android-build-merger
parent c54b10fa62 28332d5218
commit 094ac26039
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Android.bp
View File

@@ -1399,6 +1399,7 @@ droidstubs {
"core/res/AndroidManifest.xml", "core/res/AndroidManifest.xml",
], ],
args: metalava_framework_docs_args, args: metalava_framework_docs_args,
write_sdk_values: true,
} }
droidstubs { droidstubs {
@@ -1408,6 +1409,7 @@ droidstubs {
"core/res/AndroidManifest.xml", "core/res/AndroidManifest.xml",
], ],
args: metalava_framework_docs_args + " --show-annotation android.annotation.SystemApi ", args: metalava_framework_docs_args + " --show-annotation android.annotation.SystemApi ",
write_sdk_values: true,
} }
droiddoc { droiddoc {
@@ -1431,7 +1433,6 @@ droiddoc {
], ],
proofread_file: "offline-sdk-docs-proofrerad.txt", proofread_file: "offline-sdk-docs-proofrerad.txt",
args: framework_docs_only_args + " -offlinemode -title \"Android SDK\"", args: framework_docs_only_args + " -offlinemode -title \"Android SDK\"",
write_sdk_values: true,
static_doc_index_redirect: "docs/docs-preview-index.html", static_doc_index_redirect: "docs/docs-preview-index.html",
} }
@@ -1449,7 +1450,6 @@ droiddoc {
], ],
proofread_file: "offline-sdk-referenceonly-docs-proofrerad.txt", proofread_file: "offline-sdk-referenceonly-docs-proofrerad.txt",
args: framework_docs_only_args + " -offlinemode -title \"Android SDK\" -referenceonly", args: framework_docs_only_args + " -offlinemode -title \"Android SDK\" -referenceonly",
write_sdk_values: true,
static_doc_index_redirect: "docs/docs-documentation-redirect.html", static_doc_index_redirect: "docs/docs-documentation-redirect.html",
static_doc_properties: "docs/source.properties", static_doc_properties: "docs/source.properties",
} }
@@ -1469,7 +1469,6 @@ droiddoc {
proofread_file: "offline-system-sdk-referenceonly-docs-proofrerad.txt", proofread_file: "offline-system-sdk-referenceonly-docs-proofrerad.txt",
args: framework_docs_only_args + " -hide 101 -hide 104 -hide 108" + args: framework_docs_only_args + " -hide 101 -hide 104 -hide 108" +
" -offlinemode -title \"Android System SDK\" -referenceonly", " -offlinemode -title \"Android System SDK\" -referenceonly",
write_sdk_values: true,
static_doc_index_redirect: "docs/docs-documentation-redirect.html", static_doc_index_redirect: "docs/docs-documentation-redirect.html",
static_doc_properties: "docs/source.properties", static_doc_properties: "docs/source.properties",
} }

18
Android.mk
View File

@@ -54,6 +54,24 @@ $(OUT_DOCS)/offline-sdk-timestamp: $(OUT_DOCS)/offline-sdk-docs-docs.zip
.PHONY: docs offline-sdk-docs .PHONY: docs offline-sdk-docs
docs offline-sdk-docs: $(OUT_DOCS)/offline-sdk-timestamp docs offline-sdk-docs: $(OUT_DOCS)/offline-sdk-timestamp
SDK_METADATA_DIR :=$= $(call intermediates-dir-for,PACKAGING,framework-doc-stubs-metadata,,COMMON)
SDK_METADATA_FILES :=$= $(addprefix $(SDK_METADATA_DIR)/,\
activity_actions.txt \
broadcast_actions.txt \
categories.txt \
features.txt \
service_actions.txt \
widgets.txt)
SDK_METADATA :=$= $(firstword $(SDK_METADATA_FILES))
$(SDK_METADATA): .KATI_IMPLICIT_OUTPUTS := $(filter-out $(SDK_METADATA),$(SDK_METADATA_FILES))
$(SDK_METADATA): $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework-doc-stubs-metadata.zip
rm -rf $(SDK_METADATA_DIR)
mkdir -p $(SDK_METADATA_DIR)
unzip -qo $< -d $(SDK_METADATA_DIR)
.PHONY: framework-doc-stubs
framework-doc-stubs: $(SDK_METADATA)
# Run this for checkbuild # Run this for checkbuild
checkbuild: doc-comment-check-docs checkbuild: doc-comment-check-docs