From 7333a054d93fe75d7553cbb6707149fc8ae43508 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Tue, 26 Oct 2021 14:09:46 +0000 Subject: [PATCH] Revert "Change the default docs build to use module stubs" This reverts commit 4863931934083f806a6627600d1d91bb6edd42cc. Reason for revert: broke the build due to missing wifi change Change-Id: I9610a92c1b19aeb0ddab68d10f2abf2f9ed3a205 --- ApiDocs.bp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/ApiDocs.bp b/ApiDocs.bp index 8af2e02f8d087..a926ddc218a61 100644 --- a/ApiDocs.bp +++ b/ApiDocs.bp @@ -112,6 +112,7 @@ 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"], @@ -145,6 +146,12 @@ 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"], @@ -153,8 +160,11 @@ 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", + name: "framework-doc-stubs-module-stubs", defaults: ["framework-doc-stubs-default"], args: metalava_framework_docs_args, srcs: [