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

Commit 6d0886e2 authored by Paul Duffin's avatar Paul Duffin
Browse files

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
Test: m nothing
Change-Id: Ie883eb4590f9c091d4149d7b17d7d3d91b1b5c6a
parent dd22225b

java/sdk_library.go

+7 −7
Original line number Diff line number Diff line
@@ -458,7 +458,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 {
@@ -516,15 +516,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",
@@ -536,7 +536,7 @@ 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:
@@ -545,7 +545,7 @@ func (module *SdkLibrary) createStubsSources(mctx android.LoadHookContext, apiSc 
		droiddocArgs = append(droiddocArgs, " -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