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

Commit 326fce2e authored by Jerome Gaillard's avatar Jerome Gaillard
Browse files

Use Metalava to get SDK metadata for devtools 

Metalava, not Doclava, should be used to extract the metadata used in
devtools. The files created then need to be copied into the SDK.

Bug: 142480924
Test: m sdk
Change-Id: I7eb15341fde9520d51a696a6416a63e6c19c71f9
Merged-In: I7eb15341fde9520d51a696a6416a63e6c19c71f9
parent 330701c1

Android.bp

+2 −3
Original line number Diff line number Diff line
@@ -1399,6 +1399,7 @@ droidstubs { 
        "core/res/AndroidManifest.xml",

    ],

    args: metalava_framework_docs_args,

    write_sdk_values: true,

}



droidstubs {
@@ -1408,6 +1409,7 @@ droidstubs { 
        "core/res/AndroidManifest.xml",

    ],

    args: metalava_framework_docs_args + " --show-annotation android.annotation.SystemApi ",

    write_sdk_values: true,

}



droiddoc {
@@ -1431,7 +1433,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",

}
@@ -1449,7 +1450,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",

}
@@ -1469,7 +1469,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",

}

Android.mk

+18 −0
Original line number Diff line number Diff line
@@ -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