openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Run "prebuilt_postdeps" mutator again" am: 77e7d7769e am: 1226de1315 am: b2821d6c8c 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68944034e6b09d866466fb10d7caf7c0539de6ec
This commit is contained in:
Jooyung Han 2021-03-09 18:23:21 +00:00 committed by Automerger Merge Worker
parent f75649f692 b2821d6c8c
commit 7eb6684058
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
android/override_module.go
View File

@ -215,7 +215,14 @@ func RegisterOverridePostDepsMutators(ctx RegisterMutatorsContext) {
ctx.BottomUp("override_deps", overrideModuleDepsMutator).Parallel()
ctx.TopDown("register_override", registerOverrideMutator).Parallel()
ctx.BottomUp("perform_override", performOverrideMutator).Parallel()
// overridableModuleDepsMutator calls OverridablePropertiesDepsMutator so that overridable modules can
// add deps from overridable properties.
ctx.BottomUp("overridable_deps", overridableModuleDepsMutator).Parallel()
// Because overridableModuleDepsMutator is run after PrebuiltPostDepsMutator,
// prebuilt's ReplaceDependencies doesn't affect to those deps added by overridable properties.
// By running PrebuiltPostDepsMutator again after overridableModuleDepsMutator, deps via overridable properties
// can be replaced with prebuilts.
ctx.BottomUp("replace_deps_on_prebuilts_for_overridable_deps_again", PrebuiltPostDepsMutator).Parallel()
ctx.BottomUp("replace_deps_on_override", replaceDepsOnOverridingModuleMutator).Parallel()
}

3
apex/apex_test.go
View File

@ -5207,8 +5207,7 @@ func TestApexWithAppImportsPrefer(t *testing.T) {
}))
ensureExactContents(t, ctx, "myapex", "android_common_myapex_image", []string{
// TODO(b/181974714) - this is wrong it should be "app/AppFoo/AppFooPrebuilt.apk"
"app/AppFoo/AppFoo.apk",
"app/AppFoo/AppFooPrebuilt.apk",
})
}