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

Merge "Fix mutator ordering issue in apex tests" am: 97c8128eea

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f14eb119898c41cea5fb4b0f67b492ec1978979
This commit is contained in:
Paul Duffin
2021-03-06 08:47:18 +00:00
committed by Automerger Merge Worker
parent 4124d9610f 97c8128eea
commit d8033e1d26
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apex/apex_test.go
View File

@@ -240,7 +240,6 @@ func testApexContext(_ *testing.T, bp string, handlers ...testCustomizer) (*andr
ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators) ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators)
ctx.PreArchMutators(android.RegisterComponentsMutator) ctx.PreArchMutators(android.RegisterComponentsMutator)
ctx.PostDepsMutators(android.RegisterOverridePostDepsMutators)
android.RegisterPrebuiltMutators(ctx) android.RegisterPrebuiltMutators(ctx)
@@ -249,6 +248,10 @@ func testApexContext(_ *testing.T, bp string, handlers ...testCustomizer) (*andr
ctx.PreArchMutators(android.RegisterVisibilityRuleGatherer) ctx.PreArchMutators(android.RegisterVisibilityRuleGatherer)
ctx.PostDepsMutators(android.RegisterVisibilityRuleEnforcer) ctx.PostDepsMutators(android.RegisterVisibilityRuleEnforcer)
// These must come after prebuilts and visibility rules to match runtime.
ctx.PostDepsMutators(android.RegisterOverridePostDepsMutators)
// These must come after override rules to match the runtime.
cc.RegisterRequiredBuildComponentsForTest(ctx) cc.RegisterRequiredBuildComponentsForTest(ctx)
rust.RegisterRequiredBuildComponentsForTest(ctx) rust.RegisterRequiredBuildComponentsForTest(ctx)
java.RegisterRequiredBuildComponentsForTest(ctx) java.RegisterRequiredBuildComponentsForTest(ctx)
@@ -5204,7 +5207,8 @@ func TestApexWithAppImportsPrefer(t *testing.T) {
})) }))
ensureExactContents(t, ctx, "myapex", "android_common_myapex_image", []string{ ensureExactContents(t, ctx, "myapex", "android_common_myapex_image", []string{
"app/AppFoo/AppFooPrebuilt.apk", // TODO(b/181974714) - this is wrong it should be "app/AppFoo/AppFooPrebuilt.apk"
"app/AppFoo/AppFoo.apk",
}) })
} }

3
cc/testing.go
View File

@@ -20,12 +20,13 @@ import (
) )
func RegisterRequiredBuildComponentsForTest(ctx android.RegistrationContext) { func RegisterRequiredBuildComponentsForTest(ctx android.RegistrationContext) {
// Genrule components must be registered before anything from cc to match runtime behavior.
genrule.RegisterGenruleBuildComponents(ctx)
RegisterPrebuiltBuildComponents(ctx) RegisterPrebuiltBuildComponents(ctx)
RegisterCCBuildComponents(ctx) RegisterCCBuildComponents(ctx)
RegisterBinaryBuildComponents(ctx) RegisterBinaryBuildComponents(ctx)
RegisterLibraryBuildComponents(ctx) RegisterLibraryBuildComponents(ctx)
RegisterLibraryHeadersBuildComponents(ctx) RegisterLibraryHeadersBuildComponents(ctx)
genrule.RegisterGenruleBuildComponents(ctx)
ctx.RegisterModuleType("toolchain_library", ToolchainLibraryFactory) ctx.RegisterModuleType("toolchain_library", ToolchainLibraryFactory)
ctx.RegisterModuleType("llndk_library", LlndkLibraryFactory) ctx.RegisterModuleType("llndk_library", LlndkLibraryFactory)