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

Merge "Register the propagateRROEnforcementMutator" am: 713b501017

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

Change-Id: I45826d500869ad3fb768019a288d9d1521c277bf
This commit is contained in:
Paul Duffin
2021-03-23 11:39:31 +00:00
committed by Automerger Merge Worker
parent 3985e1e498 713b501017
commit 70532c454d
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/aar.go
View File

@@ -40,15 +40,14 @@ type AndroidLibraryDependency interface {
func init() {
RegisterAARBuildComponents(android.InitRegistrationContext)
android.PostDepsMutators(func(ctx android.RegisterMutatorsContext) {
ctx.TopDown("propagate_rro_enforcement", propagateRROEnforcementMutator).Parallel()
})
}
func RegisterAARBuildComponents(ctx android.RegistrationContext) {
ctx.RegisterModuleType("android_library_import", AARImportFactory)
ctx.RegisterModuleType("android_library", AndroidLibraryFactory)
ctx.PostDepsMutators(func(ctx android.RegisterMutatorsContext) {
ctx.TopDown("propagate_rro_enforcement", propagateRROEnforcementMutator).Parallel()
})
}
//

4
java/java_test.go
View File

@@ -126,10 +126,6 @@ func testContext(config android.Config) *android.TestContext {
// Register module types and mutators from cc needed for JNI testing
cc.RegisterRequiredBuildComponentsForTest(ctx)
ctx.PostDepsMutators(func(ctx android.RegisterMutatorsContext) {
ctx.TopDown("propagate_rro_enforcement", propagateRROEnforcementMutator).Parallel()
})
return ctx
}