tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Support $(location...) in droiddoc_options am: 1151247c29

Browse source 
am: 55eb2f9e03

Change-Id: Ic41eb5aac76fec8545cd8bea1fd7547a96ec2a0d
This commit is contained in:
Paul Duffin 2019-02-13 02:42:29 -08:00 committed by android-build-merger
commit 6f27c219bf
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
java/sdk_library.go
View file

@ -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