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

Commit 1151247c authored by Paul Duffin's avatar Paul Duffin
Browse files

Support $(location...) in droiddoc_options 

Adds droiddoc_option_files property which are passed through to
droiddoc's arg_files property.

Bug: 124220029
Test: make checkbuild
Change-Id: I6e98752cebeaac5a8779e04e6c804763c177e354
parent 99e4a502

java/sdk_library.go

+9 −1
Original line number Diff line number Diff line
@@ -100,7 +100,13 @@ type sdkLibraryProperties struct { 
	// list of package names that must be hidden from the API

	Hidden_api_packages []string



	// Additional droiddoc options

	// local files that are used within user customized droiddoc options.

	Droiddoc_option_files []string



	// additional droiddoc options

	// Available variables for substitution:

	//

	//  $(location <label>): the path to the droiddoc_option_files with name <label>

	Droiddoc_options []string



	// the java library (in classpath) for documentation that provides java srcs and srcjars.
@@ -434,6 +440,7 @@ func (module *sdkLibrary) createDocs(mctx android.TopDownMutatorContext, apiScop 
		Srcs_lib_whitelist_dirs          []string

		Srcs_lib_whitelist_pkgs          []string

		Libs                             []string

		Arg_files                        []string

		Args                             *string

		Api_tag_name                     *string

		Api_filename                     *string
@@ -481,6 +488,7 @@ func (module *sdkLibrary) createDocs(mctx android.TopDownMutatorContext, apiScop 
	case apiScopeTest:

		droiddocArgs = droiddocArgs + " -showAnnotation android.annotation.TestApi"

	}

	props.Arg_files = module.sdkLibraryProperties.Droiddoc_option_files

	props.Args = proptools.StringPtr(droiddocArgs)



	// List of APIs identified from the provided source files are created. They are later