Merge "Add container to the path of the merged aconfig files." into main (e92e5614) · Commits · e / os / android_build_soong

android/aconfig_providers.go

+3 −3

Original line number	Diff line number	Diff line
		@@ -68,7 +68,7 @@ func CollectDependencyAconfigFiles(ctx ModuleContext, mergedAconfigFiles *map[st
		})

		for container, aconfigFiles := range *mergedAconfigFiles {
		(*mergedAconfigFiles)[container] = mergeAconfigFiles(ctx, aconfigFiles)
		(*mergedAconfigFiles)[container] = mergeAconfigFiles(ctx, container, aconfigFiles)
		}

		SetProvider(ctx, AconfigTransitiveDeclarationsInfoProvider, AconfigTransitiveDeclarationsInfo{
		@@ -76,13 +76,13 @@ func CollectDependencyAconfigFiles(ctx ModuleContext, mergedAconfigFiles *map[st
		})
		}

		func mergeAconfigFiles(ctx ModuleContext, inputs Paths) Paths {
		func mergeAconfigFiles(ctx ModuleContext, container string, inputs Paths) Paths {
		inputs = LastUniquePaths(inputs)
		if len(inputs) == 1 {
		return Paths{inputs[0]}
		}

		output := PathForModuleOut(ctx, "aconfig_merged.pb")
		output := PathForModuleOut(ctx, container, "aconfig_merged.pb")

		ctx.Build(pctx, BuildParams{
		Rule: mergeAconfigFilesRule,

apex/apex_test.go

+4 −4

Original line number	Diff line number	Diff line
		@@ -11106,7 +11106,7 @@ func TestAconfigFilesJavaAndCcDeps(t *testing.T) {
		t.Fatalf("Expected 3 commands, got %d in:\n%s", len(aconfigArgs), s)
		}
		android.EnsureListContainsSuffix(t, aconfigArgs, "my_aconfig_declarations_foo/intermediate.pb")
		android.EnsureListContainsSuffix(t, aconfigArgs, "my_cc_library_bar/android_arm64_armv8-a_shared_apex10000/aconfig_merged.pb")
		android.EnsureListContainsSuffix(t, aconfigArgs, "my_cc_library_bar/android_arm64_armv8-a_shared_apex10000/myapex/aconfig_merged.pb")
		android.EnsureListContainsSuffix(t, aconfigArgs, "my_aconfig_declarations_baz/intermediate.pb")

		buildParams := combineAconfigRule.BuildParams
		@@ -11114,7 +11114,7 @@ func TestAconfigFilesJavaAndCcDeps(t *testing.T) {
		t.Fatalf("Expected 3 input, got %d", len(buildParams.Inputs))
		}
		android.EnsureListContainsSuffix(t, buildParams.Inputs.Strings(), "my_aconfig_declarations_foo/intermediate.pb")
		android.EnsureListContainsSuffix(t, buildParams.Inputs.Strings(), "my_cc_library_bar/android_arm64_armv8-a_shared_apex10000/aconfig_merged.pb")
		android.EnsureListContainsSuffix(t, buildParams.Inputs.Strings(), "my_cc_library_bar/android_arm64_armv8-a_shared_apex10000/myapex/aconfig_merged.pb")
		android.EnsureListContainsSuffix(t, buildParams.Inputs.Strings(), "my_aconfig_declarations_baz/intermediate.pb")
		ensureContains(t, buildParams.Output.String(), "android_common_myapex/aconfig_flags.pb")
		}
		@@ -11253,14 +11253,14 @@ func TestAconfigFilesRustDeps(t *testing.T) {
		t.Fatalf("Expected 2 commands, got %d in:\n%s", len(aconfigArgs), s)
		}
		android.EnsureListContainsSuffix(t, aconfigArgs, "my_aconfig_declarations_foo/intermediate.pb")
		android.EnsureListContainsSuffix(t, aconfigArgs, "my_rust_binary/android_arm64_armv8-a_apex10000/aconfig_merged.pb")
		android.EnsureListContainsSuffix(t, aconfigArgs, "my_rust_binary/android_arm64_armv8-a_apex10000/myapex/aconfig_merged.pb")

		buildParams := combineAconfigRule.BuildParams
		if len(buildParams.Inputs) != 2 {
		t.Fatalf("Expected 3 input, got %d", len(buildParams.Inputs))
		}
		android.EnsureListContainsSuffix(t, buildParams.Inputs.Strings(), "my_aconfig_declarations_foo/intermediate.pb")
		android.EnsureListContainsSuffix(t, buildParams.Inputs.Strings(), "my_rust_binary/android_arm64_armv8-a_apex10000/aconfig_merged.pb")
		android.EnsureListContainsSuffix(t, buildParams.Inputs.Strings(), "my_rust_binary/android_arm64_armv8-a_apex10000/myapex/aconfig_merged.pb")
		ensureContains(t, buildParams.Output.String(), "android_common_myapex/aconfig_flags.pb")
		}