From 5ea9bcc50be4259de861e9bced4681881c276611 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 27 Jul 2017 15:41:32 -0700 Subject: 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 --- java/java_test.go | 2 ++ 1 file changed, 2 insertions(+) (limited to 'java/java_test.go') 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() -- cgit v1.2.3-59-g8ed1b