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

Register the propagateRROEnforcementMutator

Browse Source 
This adds the registration of the mutator to the existing register...
method which will include it in PrepareForTestWithJavaBuildComponents.

Bug: 182885307
Test: m nothing
Change-Id: I6cea716a3ff4d8abdb80543b7e0ddf22246ffa30
This commit is contained in:
Paul Duffin
2021-03-22 13:56:43 +00:00
parent 42da69d784
commit 04ba70d665
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() { func init() {
RegisterAARBuildComponents(android.InitRegistrationContext) RegisterAARBuildComponents(android.InitRegistrationContext)
android.PostDepsMutators(func(ctx android.RegisterMutatorsContext) {
ctx.TopDown("propagate_rro_enforcement", propagateRROEnforcementMutator).Parallel()
})
} }
func RegisterAARBuildComponents(ctx android.RegistrationContext) { func RegisterAARBuildComponents(ctx android.RegistrationContext) {
ctx.RegisterModuleType("android_library_import", AARImportFactory) ctx.RegisterModuleType("android_library_import", AARImportFactory)
ctx.RegisterModuleType("android_library", AndroidLibraryFactory) 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 // Register module types and mutators from cc needed for JNI testing
cc.RegisterRequiredBuildComponentsForTest(ctx) cc.RegisterRequiredBuildComponentsForTest(ctx)
ctx.PostDepsMutators(func(ctx android.RegisterMutatorsContext) {
ctx.TopDown("propagate_rro_enforcement", propagateRROEnforcementMutator).Parallel()
})
return ctx return ctx
} }