From 2e6a904ac6f5e4511a5c9430822919d3b35eab78 Mon Sep 17 00:00:00 2001 From: Anton Hansson <hansson@google.com> Date: Wed, 11 Oct 2023 13:56:42 +0000 Subject: [PATCH] Cleanup obsolete doc build targets - the *-check-docs target doesn't do anything the other targets don't - online-* are, I think, the old d.a.c targets but the ds-* targets are what's currently used - the hidden-* target isn't meaningfully different from others, either Test: presubmit Change-Id: Icab977d40917aa14c629629965c6126e20f4f3ee --- Android.mk | 3 -- api/ApiDocs.bp | 120 ------------------------------------------------- 2 files changed, 123 deletions(-) diff --git a/Android.mk b/Android.mk index d9e202c9305c..e2c1ed8e9ddb 100644 --- a/Android.mk +++ b/Android.mk @@ -69,9 +69,6 @@ $(SDK_METADATA): $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework-doc-stub .PHONY: framework-doc-stubs framework-doc-stubs: $(SDK_METADATA) -# Run this for checkbuild -checkbuild: doc-comment-check-docs - # Include subdirectory makefiles # ============================================================ diff --git a/api/ApiDocs.bp b/api/ApiDocs.bp index b1178fca64da..30b442336148 100644 --- a/api/ApiDocs.bp +++ b/api/ApiDocs.bp @@ -200,20 +200,6 @@ doc_defaults { }, } -doc_defaults { - name: "framework-dokka-docs-default", -} - -droiddoc { - name: "doc-comment-check-docs", - defaults: ["framework-docs-default"], - srcs: [ - ":framework-doc-stubs", - ], - args: framework_docs_only_args + " -referenceonly -parsecomments", - installable: false, -} - droiddoc { name: "offline-sdk-docs", defaults: ["framework-docs-default"], @@ -266,70 +252,6 @@ droiddoc { static_doc_properties: "docs/source.properties", } -droiddoc { - name: "online-sdk-docs", - defaults: ["framework-docs-default"], - srcs: [ - ":framework-doc-stubs", - ], - hdf: [ - "android.whichdoc online", - "android.hasSamples true", - ], - proofread_file: "online-sdk-docs-proofread.txt", - args: framework_docs_only_args + - " -toroot / -samplegroup Admin " + - " -samplegroup Background " + - " -samplegroup Connectivity " + - " -samplegroup Content " + - " -samplegroup Input " + - " -samplegroup Media " + - " -samplegroup Notification " + - " -samplegroup RenderScript " + - " -samplegroup Security " + - " -samplegroup Sensors " + - " -samplegroup System " + - " -samplegroup Testing " + - " -samplegroup UI " + - " -samplegroup Views " + - " -samplegroup Wearable -samplesdir development/samples/browseable ", -} - -droiddoc { - name: "online-system-api-sdk-docs", - defaults: ["framework-docs-default"], - srcs: [ - ":framework-doc-system-stubs", - ], - hdf: [ - "android.whichdoc online", - "android.hasSamples true", - ], - proofread_file: "online-system-api-sdk-docs-proofread.txt", - args: framework_docs_only_args + - " -referenceonly " + - " -title \"Android SDK - Including system APIs.\" " + - " -hide 101 " + - " -hide 104 " + - " -hide 108 " + - " -toroot / -samplegroup Admin " + - " -samplegroup Background " + - " -samplegroup Connectivity " + - " -samplegroup Content " + - " -samplegroup Input " + - " -samplegroup Media " + - " -samplegroup Notification " + - " -samplegroup RenderScript " + - " -samplegroup Security " + - " -samplegroup Sensors " + - " -samplegroup System " + - " -samplegroup Testing " + - " -samplegroup UI " + - " -samplegroup Views " + - " -samplegroup Wearable -samplesdir development/samples/browseable ", - installable: false, -} - droiddoc { name: "ds-docs-java", defaults: ["framework-docs-default"], @@ -361,7 +283,6 @@ droiddoc { droiddoc { name: "ds-docs-kt", - defaults: ["framework-dokka-docs-default"], srcs: [ ":framework-doc-stubs", ], @@ -440,44 +361,3 @@ droiddoc { " -atLinksNavtree " + " -navtreeonly ", } - -droiddoc { - name: "online-sdk-dev-docs", - defaults: ["framework-docs-default"], - srcs: [ - ":framework-doc-stubs", - ], - hdf: [ - "android.whichdoc online", - "android.hasSamples true", - ], - proofread_file: "online-sdk-dev-docs-proofread.txt", - args: framework_docs_only_args + - " -toroot / -samplegroup Admin " + - " -samplegroup Background " + - " -samplegroup Connectivity " + - " -samplegroup Content " + - " -samplegroup Input " + - " -samplegroup Media " + - " -samplegroup Notification " + - " -samplegroup RenderScript " + - " -samplegroup Security " + - " -samplegroup Sensors " + - " -samplegroup System " + - " -samplegroup Testing " + - " -samplegroup UI " + - " -samplegroup Views " + - " -samplegroup Wearable -samplesdir development/samples/browseable ", -} - -droiddoc { - name: "hidden-docs", - defaults: ["framework-docs-default"], - srcs: [ - ":framework-doc-stubs", - ], - proofread_file: "hidden-docs-proofread.txt", - args: framework_docs_only_args + - " -referenceonly " + - " -title \"Android SDK - Including hidden APIs.\"", -} -- GitLab