diff options
| author | Colin Cross <ccross@android.com> | 2017-07-27 15:41:32 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-07-31 23:50:01 -0700 |
| commit | 5ea9bcc50be4259de861e9bced4681881c276611 (patch) | |
| tree | 99a99334271e13fa7ee3b1619dadc308a7ec329c /java/java_test.go | |
| parent | ed2c78ef4e1340ca97528de95b32daeb6f95947d (diff) | |
Fix java prebuilts
The java prebuilt tests weren't registering the prebuilts mutators,
which hid an issue where prebuilts modules weren't getting renamed
to avoid collisions with source modules of the same name, which
ended up causing the prebuilt module to try to add a dependency
on itself.
Test: java_test.go
Change-Id: I3327d27533591cb08a4b8b8b5e1668a6f72be8df
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 344361058..de3be494a 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -57,6 +57,8 @@ func testJava(t *testing.T, bp string) *android.TestContext { ctx.RegisterModuleType("java_library", android.ModuleFactoryAdaptor(LibraryFactory)) ctx.RegisterModuleType("java_prebuilt_library", android.ModuleFactoryAdaptor(PrebuiltFactory)) ctx.RegisterModuleType("java_defaults", android.ModuleFactoryAdaptor(defaultsFactory)) + ctx.PreArchMutators(android.RegisterPrebuiltsPreArchMutators) + ctx.PreArchMutators(android.RegisterPrebuiltsPostDepsMutators) ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators) ctx.Register() |