diff options
| author | 2020-07-30 16:04:17 +0100 | |
|---|---|---|
| committer | 2020-07-31 16:12:01 +0100 | |
| commit | 021f4e525f987baa3a0b934084a8d49ed4ef00ec (patch) | |
| tree | 2370ba6e80f3ca61178bc9e337dd09cfd3ece2fe /java/java_test.go | |
| parent | 359d4f3374f4c985d999d51dd8115f5ecc4dddc5 (diff) | |
Fix prebuilt mutator ordering in tests
Previously, the prebuilt mutators were added by the
cc.RegisterRequiredBuildComponentsForTest() function as a convenience
but unfortunately it lead to some of the mutators being in a different
order in the tests than in the normal build.
This change:
* Extracts the RegisterPrebuiltMutators() call from
cc.RegisterRequiredBuildComponentsForTest()
* Makes sure that the prebuilt mutators are registered before the
visibility gatherer and enforcer mutators.
Bug: 162505935
Test: m nothing
Change-Id: I7d959b558200b502f0a5e4653c41ea01414e142a
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/java/java_test.go b/java/java_test.go index 582ebe945..41f57f2df 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -96,6 +96,8 @@ func testContext() *android.TestContext { ctx.RegisterPreSingletonType("overlay", android.SingletonFactoryAdaptor(OverlaySingletonFactory)) ctx.RegisterPreSingletonType("sdk_versions", android.SingletonFactoryAdaptor(sdkPreSingletonFactory)) + android.RegisterPrebuiltMutators(ctx) + // Register module types and mutators from cc needed for JNI testing cc.RegisterRequiredBuildComponentsForTest(ctx) |