From edeadbfdcf6c403dd1f1dcd232cf7b5c9b2f14d9 Mon Sep 17 00:00:00 2001 From: Yu Liu Date: Wed, 10 Jan 2024 23:07:35 +0000 Subject: [PATCH] Add container to the path of the merged aconfig files. Bug: 312769710 Test: CI Change-Id: I4b8a71cf86a3bcefc4a41360a241aa14b798f6e8 --- android/aconfig_providers.go | 6 +++--- apex/apex_test.go | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/android/aconfig_providers.go b/android/aconfig_providers.go index b10036ee7..4ba1a88f0 100644 --- a/android/aconfig_providers.go +++ b/android/aconfig_providers.go @@ -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, diff --git a/apex/apex_test.go b/apex/apex_test.go index a943e4e02..2a15bd376 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -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") }