From cbcfcaa113f7d518ab916461a824e3ff970b7a67 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 7 Apr 2020 18:49:53 +0100 Subject: [PATCH] Replace references to droiddoc with droidstubs The java_sdk_library code used to create droiddoc and now it creates droidstubs but it still referenced droiddoc internally. This change removed all the remaining references except the ones that are visible externally. Bug: 153443117 Bug: 153306490 Test: m nothing Merged-In: Ie883eb4590f9c091d4149d7b17d7d3d91b1b5c6a Change-Id: Ie883eb4590f9c091d4149d7b17d7d3d91b1b5c6a --- java/sdk_library.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/java/sdk_library.go b/java/sdk_library.go index 374a5e5af..f34459ded 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -451,7 +451,7 @@ func (module *SdkLibrary) createStubsLibrary(mctx android.LoadHookContext, apiSc mctx.CreateModule(LibraryFactory, &props) } -// Creates a droiddoc module that creates stubs source files from the given full source +// Creates a droidstubs module that creates stubs source files from the given full source // files func (module *SdkLibrary) createStubsSources(mctx android.LoadHookContext, apiScope *apiScope) { props := struct { @@ -506,15 +506,15 @@ func (module *SdkLibrary) createStubsSources(mctx android.LoadHookContext, apiSc props.Merge_annotations_dirs = module.sdkLibraryProperties.Merge_annotations_dirs props.Merge_inclusion_annotations_dirs = module.sdkLibraryProperties.Merge_inclusion_annotations_dirs - droiddocArgs := []string{} + droidstubsArgs := []string{} if len(module.sdkLibraryProperties.Api_packages) != 0 { - droiddocArgs = append(droiddocArgs, "--stub-packages "+strings.Join(module.sdkLibraryProperties.Api_packages, ":")) + droidstubsArgs = append(droidstubsArgs, "--stub-packages "+strings.Join(module.sdkLibraryProperties.Api_packages, ":")) } if len(module.sdkLibraryProperties.Hidden_api_packages) != 0 { - droiddocArgs = append(droiddocArgs, + droidstubsArgs = append(droidstubsArgs, android.JoinWithPrefix(module.sdkLibraryProperties.Hidden_api_packages, " --hide-package ")) } - droiddocArgs = append(droiddocArgs, module.sdkLibraryProperties.Droiddoc_options...) + droidstubsArgs = append(droidstubsArgs, module.sdkLibraryProperties.Droiddoc_options...) disabledWarnings := []string{ "MissingPermission", "BroadcastBehavior", @@ -526,16 +526,16 @@ func (module *SdkLibrary) createStubsSources(mctx android.LoadHookContext, apiSc "Todo", "Typo", } - droiddocArgs = append(droiddocArgs, android.JoinWithPrefix(disabledWarnings, "--hide ")) + droidstubsArgs = append(droidstubsArgs, android.JoinWithPrefix(disabledWarnings, "--hide ")) switch apiScope { case apiScopeSystem: - droiddocArgs = append(droiddocArgs, "-showAnnotation android.annotation.SystemApi") + droidstubsArgs = append(droidstubsArgs, "-showAnnotation android.annotation.SystemApi") case apiScopeTest: - droiddocArgs = append(droiddocArgs, " -showAnnotation android.annotation.TestApi") + droidstubsArgs = append(droidstubsArgs, " -showAnnotation android.annotation.TestApi") } props.Arg_files = module.sdkLibraryProperties.Droiddoc_option_files - props.Args = proptools.StringPtr(strings.Join(droiddocArgs, " ")) + props.Args = proptools.StringPtr(strings.Join(droidstubsArgs, " ")) // List of APIs identified from the provided source files are created. They are later // compared against to the not-yet-released (a.k.a current) list of APIs and to the