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

Commit 55eb2f9e authored by Paul Duffin's avatar Paul Duffin Committed by android-build-merger
Browse files

Support $(location...) in droiddoc_options

am: 1151247c

Change-Id: Ife22fe8dcc94cd83d2757f07ebe39a7a9cdbdf92
parents a0957054 1151247c
Loading
Loading
Loading
Loading
+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