StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix typo in mutator name" into main am: e2cfe50279 am: 5361b43ddb

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2665657

Change-Id: Id833c656ef0d00964637cab5ff3c130c251c463d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-07-20 03:01:11 +00:00
committed by Automerger Merge Worker
parent f4214eaa47 5361b43ddb
commit b9c4cf09f7
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/bazel_paths.go
View File

@@ -179,7 +179,7 @@ func BazelLabelForModuleDepSingle(ctx BazelConversionPathContext, path string) b
// paths, relative to the local module, or Bazel-labels (absolute if in a different package or // paths, relative to the local module, or Bazel-labels (absolute if in a different package or
// relative if within the same package). // relative if within the same package).
// Properties must have been annotated with struct tag `android:"path"` so that dependencies modules // Properties must have been annotated with struct tag `android:"path"` so that dependencies modules
// will have already been handled by the path_deps mutator. // will have already been handled by the pathdeps mutator.
func BazelLabelForModuleSrc(ctx BazelConversionPathContext, paths []string) bazel.LabelList { func BazelLabelForModuleSrc(ctx BazelConversionPathContext, paths []string) bazel.LabelList {
return BazelLabelForModuleSrcExcludes(ctx, paths, []string(nil)) return BazelLabelForModuleSrcExcludes(ctx, paths, []string(nil))
} }
@@ -189,7 +189,7 @@ func BazelLabelForModuleSrc(ctx BazelConversionPathContext, paths []string) baze
// references in paths, minus those in excludes, relative to the local module, or Bazel-labels // references in paths, minus those in excludes, relative to the local module, or Bazel-labels
// (absolute if in a different package or relative if within the same package). // (absolute if in a different package or relative if within the same package).
// Properties must have been annotated with struct tag `android:"path"` so that dependencies modules // Properties must have been annotated with struct tag `android:"path"` so that dependencies modules
// will have already been handled by the path_deps mutator. // will have already been handled by the pathdeps mutator.
func BazelLabelForModuleSrcExcludes(ctx BazelConversionPathContext, paths, excludes []string) bazel.LabelList { func BazelLabelForModuleSrcExcludes(ctx BazelConversionPathContext, paths, excludes []string) bazel.LabelList {
excludeLabels := expandSrcsForBazel(ctx, excludes, []string(nil)) excludeLabels := expandSrcsForBazel(ctx, excludes, []string(nil))
excluded := make([]string, 0, len(excludeLabels.Includes)) excluded := make([]string, 0, len(excludeLabels.Includes))
@@ -355,7 +355,7 @@ func RootToModuleRelativePaths(ctx BazelConversionPathContext, paths Paths) []ba
// //
// Properties passed as the paths or excludes argument must have been annotated with struct tag // Properties passed as the paths or excludes argument must have been annotated with struct tag
// `android:"path"` so that dependencies on other modules will have already been handled by the // `android:"path"` so that dependencies on other modules will have already been handled by the
// path_deps mutator. // pathdeps mutator.
func expandSrcsForBazel(ctx BazelConversionPathContext, paths, expandedExcludes []string) bazel.LabelList { func expandSrcsForBazel(ctx BazelConversionPathContext, paths, expandedExcludes []string) bazel.LabelList {
if paths == nil { if paths == nil {
return bazel.LabelList{} return bazel.LabelList{}

6
android/paths.go
View File

@@ -396,7 +396,7 @@ func ExistentPathsForSources(ctx PathGlobContext, paths []string) Paths {
// //
// Properties passed as the paths argument must have been annotated with struct tag // Properties passed as the paths argument must have been annotated with struct tag
// `android:"path"` so that dependencies on SourceFileProducer modules will have already been handled by the // `android:"path"` so that dependencies on SourceFileProducer modules will have already been handled by the
// path_deps mutator. // pathdeps mutator.
// If a requested module is not found as a dependency: // If a requested module is not found as a dependency:
// - if ctx.Config().AllowMissingDependencies() is true, this module to be marked as having // - if ctx.Config().AllowMissingDependencies() is true, this module to be marked as having
// missing dependencies // missing dependencies
@@ -425,7 +425,7 @@ type SourceInput struct {
// excluding the items (similarly resolved // excluding the items (similarly resolved
// Properties passed as the paths argument must have been annotated with struct tag // Properties passed as the paths argument must have been annotated with struct tag
// `android:"path"` so that dependencies on SourceFileProducer modules will have already been handled by the // `android:"path"` so that dependencies on SourceFileProducer modules will have already been handled by the
// path_deps mutator. // pathdeps mutator.
// If a requested module is not found as a dependency: // If a requested module is not found as a dependency:
// - if ctx.Config().AllowMissingDependencies() is true, this module to be marked as having // - if ctx.Config().AllowMissingDependencies() is true, this module to be marked as having
// missing dependencies // missing dependencies
@@ -560,7 +560,7 @@ func GetModuleFromPathDep(ctx ModuleWithDepsPathContext, moduleName, tag string)
// and a list of the module names of missing module dependencies are returned as the second return. // and a list of the module names of missing module dependencies are returned as the second return.
// Properties passed as the paths argument must have been annotated with struct tag // Properties passed as the paths argument must have been annotated with struct tag
// `android:"path"` so that dependencies on SourceFileProducer modules will have already been handled by the // `android:"path"` so that dependencies on SourceFileProducer modules will have already been handled by the
// path_deps mutator. // pathdeps mutator.
func PathsAndMissingDepsForModuleSrcExcludes(ctx ModuleMissingDepsPathContext, paths, excludes []string) (Paths, []string) { func PathsAndMissingDepsForModuleSrcExcludes(ctx ModuleMissingDepsPathContext, paths, excludes []string) (Paths, []string) {
return PathsAndMissingDepsRelativeToModuleSourceDir(SourceInput{ return PathsAndMissingDepsRelativeToModuleSourceDir(SourceInput{
Context: ctx, Context: ctx,