summaryrefslogtreecommitdiff
path: root/java/java_test.go
diff options
context:
space:
mode:
author Bill Rassieur <rassb@google.com> 2019-03-29 04:13:31 +0000
committer Bill Rassieur <rassb@google.com> 2019-03-29 04:13:31 +0000
commit27d35885dfbcd37bbff0e2ef926bd63205904268 (patch)
treea0b41ca83df928c380531ec49087c795d93b9331 /java/java_test.go
parent5b284c4e64981d3503c9b6201e2bae836d7562ab (diff)
parent120e1f03d9d54c4102438c551129302360cf277d (diff)
Merge master@5406228 into git_qt-dev-plus-aosp.
Change-Id: I28b591a5816adbefb89d2617e74f0aac5156325b BUG: 129345239
Diffstat (limited to 'java/java_test.go')
-rw-r--r--java/java_test.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/java/java_test.go b/java/java_test.go
index a43f1f79e..f4664996e 100644
--- a/java/java_test.go
+++ b/java/java_test.go
@@ -86,10 +86,12 @@ func testContext(config android.Config, bp string,
ctx.RegisterModuleType("droiddoc_host", android.ModuleFactoryAdaptor(DroiddocHostFactory))
ctx.RegisterModuleType("droiddoc_template", android.ModuleFactoryAdaptor(ExportedDroiddocDirFactory))
ctx.RegisterModuleType("java_sdk_library", android.ModuleFactoryAdaptor(SdkLibraryFactory))
+ ctx.RegisterModuleType("override_android_app", android.ModuleFactoryAdaptor(OverrideAndroidAppModuleFactory))
ctx.RegisterModuleType("prebuilt_apis", android.ModuleFactoryAdaptor(PrebuiltApisFactory))
ctx.PreArchMutators(android.RegisterPrebuiltsPreArchMutators)
ctx.PreArchMutators(android.RegisterPrebuiltsPostDepsMutators)
ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators)
+ ctx.PreArchMutators(android.RegisterOverridePreArchMutators)
ctx.PreArchMutators(func(ctx android.RegisterMutatorsContext) {
ctx.TopDown("prebuilt_apis", PrebuiltApisMutator).Parallel()
ctx.TopDown("java_sdk_library", SdkLibraryMutator).Parallel()