diff options
| -rw-r--r-- | aconfig/aconfig_declarations.go | 2 | ||||
| -rw-r--r-- | aconfig/aconfig_declarations_test.go | 5 | ||||
| -rw-r--r-- | aconfig/init.go | 4 | ||||
| -rw-r--r-- | android/allowlists/allowlists.go | 1 | ||||
| -rw-r--r-- | android/bazel_paths.go | 6 | ||||
| -rw-r--r-- | android/paths.go | 6 |
6 files changed, 14 insertions, 10 deletions
diff --git a/aconfig/aconfig_declarations.go b/aconfig/aconfig_declarations.go index 007d5290f..565d18534 100644 --- a/aconfig/aconfig_declarations.go +++ b/aconfig/aconfig_declarations.go @@ -125,12 +125,12 @@ func (module *DeclarationsModule) GenerateAndroidBuildActions(ctx android.Module intermediatePath := android.PathForModuleOut(ctx, "intermediate.pb") ctx.Build(pctx, android.BuildParams{ Rule: aconfigRule, - Inputs: inputFiles, Output: intermediatePath, Description: "aconfig_declarations", Args: map[string]string{ "release_version": ctx.Config().ReleaseVersion(), "package": module.properties.Package, + "declarations": android.JoinPathsWithPrefix(inputFiles, "--declarations "), "values": joinAndPrefix(" --values ", module.properties.Values), }, }) diff --git a/aconfig/aconfig_declarations_test.go b/aconfig/aconfig_declarations_test.go index e14ca3851..e0d8f7d5a 100644 --- a/aconfig/aconfig_declarations_test.go +++ b/aconfig/aconfig_declarations_test.go @@ -26,7 +26,10 @@ func TestAconfigDeclarations(t *testing.T) { aconfig_declarations { name: "module_name", package: "com.example.package", - srcs: ["foo.aconfig"], + srcs: [ + "foo.aconfig", + "bar.aconfig", + ], } ` result := runTest(t, android.FixtureExpectsNoErrors, bp) diff --git a/aconfig/init.go b/aconfig/init.go index 161fd4248..634612d63 100644 --- a/aconfig/init.go +++ b/aconfig/init.go @@ -27,7 +27,7 @@ var ( blueprint.RuleParams{ Command: `${aconfig} create-cache` + ` --package ${package}` + - ` --declarations ${in}` + + ` ${declarations}` + ` ${values}` + ` --cache ${out}.tmp` + ` && ( if cmp -s ${out}.tmp ; then rm ${out}.tmp ; else mv ${out}.tmp ${out} ; fi )`, @@ -36,7 +36,7 @@ var ( "${aconfig}", }, Restat: true, - }, "release_version", "package", "values") + }, "release_version", "package", "declarations", "values") // For java_aconfig_library: Generate java file srcJarRule = pctx.AndroidStaticRule("aconfig_srcjar", diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go index d64c44682..6f09a6d02 100644 --- a/android/allowlists/allowlists.go +++ b/android/allowlists/allowlists.go @@ -429,6 +429,7 @@ var ( // external/bazelbuild-rules_android/... is needed by mixed builds, otherwise mixed builds analysis fails // e.g. ERROR: Analysis of target '@soong_injection//mixed_builds:buildroot' failed "external/bazelbuild-rules_android":/* recursive = */ true, + "external/bazelbuild-rules_java":/* recursive = */ true, "external/bazelbuild-rules_license":/* recursive = */ true, "external/bazelbuild-rules_go":/* recursive = */ true, "external/bazelbuild-kotlin-rules":/* recursive = */ true, diff --git a/android/bazel_paths.go b/android/bazel_paths.go index 2f5ff643d..8956a18d5 100644 --- a/android/bazel_paths.go +++ b/android/bazel_paths.go @@ -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 // relative if within the same package). // 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 { 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 // (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 -// 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 { excludeLabels := expandSrcsForBazel(ctx, excludes, []string(nil)) 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 // `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 { if paths == nil { return bazel.LabelList{} diff --git a/android/paths.go b/android/paths.go index fda4d2f46..e16cb3781 100644 --- a/android/paths.go +++ b/android/paths.go @@ -396,7 +396,7 @@ func ExistentPathsForSources(ctx PathGlobContext, paths []string) Paths { // // 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 -// path_deps mutator. +// pathdeps mutator. // If a requested module is not found as a dependency: // - if ctx.Config().AllowMissingDependencies() is true, this module to be marked as having // missing dependencies @@ -425,7 +425,7 @@ type SourceInput struct { // excluding the items (similarly resolved // 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 -// path_deps mutator. +// pathdeps mutator. // If a requested module is not found as a dependency: // - if ctx.Config().AllowMissingDependencies() is true, this module to be marked as having // 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. // 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 -// path_deps mutator. +// pathdeps mutator. func PathsAndMissingDepsForModuleSrcExcludes(ctx ModuleMissingDepsPathContext, paths, excludes []string) (Paths, []string) { return PathsAndMissingDepsRelativeToModuleSourceDir(SourceInput{ Context: ctx, |