commit c132742c963ed5501c82deb09a7e7c624dbafd44
author Paul Duffin <paulduffin@google.com> Tue Jan 14 12:15:29 2020 +0000
committer Paul Duffin <paulduffin@google.com> Wed Jan 15 11:17:57 2020 +0000
tree 047c8b9c8e293379371eecb3e0b12c7be36b17cc
parent a80ef84652eda6dbb14a0bec358e7213e3b2dd09

Dedup package build components registration

Bug: 146540677
Test: m nothing
Change-Id: Iff2d7063b7f06313e9068c61a5627229463c98dd

sdk/testing.go

diff --git a/sdk/testing.go b/sdk/testing.go
index 8097889..c9cc30f 100644
--- a/sdk/testing.go
+++ b/sdk/testing.go
@@ -62,14 +62,12 @@
 	ctx := android.NewTestArchContext()
 
 	// from android package
-	ctx.PreArchMutators(android.RegisterPackageRenamer)
+	android.RegisterPackageBuildComponents(ctx)
 	ctx.PreArchMutators(android.RegisterVisibilityRuleChecker)
 	ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators)
 	ctx.PreArchMutators(android.RegisterVisibilityRuleGatherer)
 	ctx.PostDepsMutators(android.RegisterVisibilityRuleEnforcer)
 
-	ctx.RegisterModuleType("package", android.PackageFactory)
-
 	// from java package
 	java.RegisterJavaBuildComponents(ctx)
 	java.RegisterAppBuildComponents(ctx)