diff options
Diffstat (limited to 'android/paths.go')
| -rw-r--r-- | android/paths.go | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/android/paths.go b/android/paths.go index c3fa61a09..58e1f746b 100644 --- a/android/paths.go +++ b/android/paths.go @@ -280,7 +280,8 @@ func (paths Paths) containsPath(path Path) bool { return false } -// PathsForSource returns Paths rooted from SrcDir +// PathsForSource returns Paths rooted from SrcDir, *not* rooted from the module's local source +// directory func PathsForSource(ctx PathContext, paths []string) Paths { ret := make(Paths, len(paths)) for i, path := range paths { @@ -289,9 +290,9 @@ func PathsForSource(ctx PathContext, paths []string) Paths { return ret } -// ExistentPathsForSources returns a list of Paths rooted from SrcDir that are -// found in the tree. If any are not found, they are omitted from the list, -// and dependencies are added so that we're re-run when they are added. +// ExistentPathsForSources returns a list of Paths rooted from SrcDir, *not* rooted from the +// module's local source directory, that are found in the tree. If any are not found, they are +// omitted from the list, and dependencies are added so that we're re-run when they are added. func ExistentPathsForSources(ctx PathContext, paths []string) Paths { ret := make(Paths, 0, len(paths)) for _, path := range paths { @@ -395,6 +396,9 @@ func BazelLabelForModuleSrcExcludes(ctx BazelConversionPathContext, paths, exclu // `android:"path"` so that dependencies on other modules will have already been handled by the // path_properties mutator. func expandSrcsForBazel(ctx BazelConversionPathContext, paths, expandedExcludes []string) bazel.LabelList { + if paths == nil { + return bazel.LabelList{} + } labels := bazel.LabelList{ Includes: []bazel.Label{}, } @@ -1024,9 +1028,10 @@ func PathForSource(ctx PathContext, pathComponents ...string) SourcePath { return path } -// ExistentPathForSource returns an OptionalPath with the SourcePath if the -// path exists, or an empty OptionalPath if it doesn't exist. Dependencies are added -// so that the ninja file will be regenerated if the state of the path changes. +// ExistentPathForSource returns an OptionalPath with the SourcePath, rooted from SrcDir, *not* +// rooted from the module's local source directory, if the path exists, or an empty OptionalPath if +// it doesn't exist. Dependencies are added so that the ninja file will be regenerated if the state +// of the path changes. func ExistentPathForSource(ctx PathContext, pathComponents ...string) OptionalPath { path, err := pathForSource(ctx, pathComponents...) if err != nil { |