diff options
| author | 2019-10-21 02:49:49 -0700 | |
|---|---|---|
| committer | 2019-10-21 02:49:49 -0700 | |
| commit | 7f5ca69a4e81f5c47d1e77f7f0173926262e45dd (patch) | |
| tree | 7ad743f521419ccb3f4525e53c8579b1212ef7f4 | |
| parent | 47a4b525f847ed03dcad3a80f5a4389471e80a65 (diff) | |
| parent | a56124379cb20556b1fa5329cd762b94de885ffe (diff) | |
Merge "Use Metalava to get SDK metadata for devtools"
am: a56124379c
Change-Id: I59277a64511759946e46cf98cea04db590301366
| -rw-r--r-- | Android.bp | 5 | ||||
| -rw-r--r-- | Android.mk | 18 |
2 files changed, 20 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp index 408cf7ac0edc..53b1a641ebc1 100644 --- a/Android.bp +++ b/Android.bp @@ -1019,6 +1019,7 @@ droidstubs { "core/res/AndroidManifest.xml", ], args: metalava_framework_docs_args, + write_sdk_values: true, } droidstubs { @@ -1028,6 +1029,7 @@ droidstubs { "core/res/AndroidManifest.xml", ], args: metalava_framework_docs_args + " --show-annotation android.annotation.SystemApi ", + write_sdk_values: true, } droiddoc { @@ -1051,7 +1053,6 @@ droiddoc { ], proofread_file: "offline-sdk-docs-proofrerad.txt", args: framework_docs_only_args + " -offlinemode -title \"Android SDK\"", - write_sdk_values: true, static_doc_index_redirect: "docs/docs-preview-index.html", } @@ -1069,7 +1070,6 @@ droiddoc { ], proofread_file: "offline-sdk-referenceonly-docs-proofrerad.txt", 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_properties: "docs/source.properties", } @@ -1089,7 +1089,6 @@ droiddoc { proofread_file: "offline-system-sdk-referenceonly-docs-proofrerad.txt", args: framework_docs_only_args + " -hide 101 -hide 104 -hide 108" + " -offlinemode -title \"Android System SDK\" -referenceonly", - write_sdk_values: true, static_doc_index_redirect: "docs/docs-documentation-redirect.html", static_doc_properties: "docs/source.properties", } diff --git a/Android.mk b/Android.mk index 9bda2dc6d69a..815a169f3880 100644 --- a/Android.mk +++ b/Android.mk @@ -54,6 +54,24 @@ $(OUT_DOCS)/offline-sdk-timestamp: $(OUT_DOCS)/offline-sdk-docs-docs.zip .PHONY: docs offline-sdk-docs 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 checkbuild: doc-comment-check-docs |