From 111e15841a11e619ddc12b2a1e12410f47012835 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Tue, 26 Oct 2021 14:12:10 +0000 Subject: [PATCH] Re-submit "Change the default docs build to use module stubs" This reverts commit 7333a054d93fe75d7553cbb6707149fc8ae43508. Reason for revert: Wifi fix: Ia82033ed22e9f07d982eb35740350ac1ef11fe49 Change-Id: I6ccb1d3fa6311bb66d78d93a567fddb1bb2d5be1 --- ApiDocs.bp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/ApiDocs.bp b/ApiDocs.bp index a926ddc218a61..8af2e02f8d087 100644 --- a/ApiDocs.bp +++ b/ApiDocs.bp @@ -112,7 +112,6 @@ stubs_defaults { } // Defaults module for doc-stubs targets that use module source code as input. -// This is the default/normal. stubs_defaults { name: "framework-doc-stubs-sources-default", defaults: ["framework-doc-stubs-default"], @@ -146,12 +145,6 @@ droidstubs { " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\) ", } -droidstubs { - name: "framework-doc-stubs", - defaults: ["framework-doc-stubs-sources-default"], - args: metalava_framework_docs_args, -} - droidstubs { name: "framework-doc-system-stubs", defaults: ["framework-doc-stubs-sources-default"], @@ -160,11 +153,8 @@ droidstubs { api_levels_sdk_type: "system", } -// Experimental target building doc stubs with module stub source code as input. -// This is intended to eventually replace framework-doc-stubs, once all diffs -// have been eliminated. droidstubs { - name: "framework-doc-stubs-module-stubs", + name: "framework-doc-stubs", defaults: ["framework-doc-stubs-default"], args: metalava_framework_docs_args, srcs: [