Merge "Add Srcs_lib and Srcs_lib_whitelist_dirs properties"

This commit is contained in:
Treehugger Robot 2019-01-11 06:27:51 +00:00 committed by Gerrit Code Review
commit 9816749b90

View file

@ -124,6 +124,12 @@ type sdkLibraryProperties struct {
// This applies to the stubs lib. // This applies to the stubs lib.
Compile_dex *bool Compile_dex *bool
// the java library (in classpath) for documentation that provides java srcs and srcjars.
Srcs_lib *string
// the base dirs under srcs_lib will be scanned for java srcs.
Srcs_lib_whitelist_dirs []string
// the sub dirs under srcs_lib_whitelist_dirs will be scanned for java srcs. // the sub dirs under srcs_lib_whitelist_dirs will be scanned for java srcs.
// Defaults to "android.annotation". // Defaults to "android.annotation".
Srcs_lib_whitelist_pkgs []string Srcs_lib_whitelist_pkgs []string
@ -541,6 +547,10 @@ func (module *sdkLibrary) createDocs(mctx android.TopDownMutatorContext, apiScop
} else { } else {
props.Srcs_lib_whitelist_pkgs = []string{"android.annotation"} props.Srcs_lib_whitelist_pkgs = []string{"android.annotation"}
} }
} else {
props.Srcs_lib = module.properties.Srcs_lib
props.Srcs_lib_whitelist_dirs = module.properties.Srcs_lib_whitelist_dirs
props.Srcs_lib_whitelist_pkgs = module.properties.Srcs_lib_whitelist_pkgs
} }
if Bool(module.properties.Metalava_enabled) == true { if Bool(module.properties.Metalava_enabled) == true {