From 43b92e0d0f477e2ae9f3c3e07696e2d1760b7d84 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 18 Nov 2019 15:28:57 -0800 Subject: Make CreateVariations return []android.Module Test: soong tests Change-Id: I9bc40642c4902392eb8193bf73e32b7f1c18c14e --- android/apex.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'android/apex.go') diff --git a/android/apex.go b/android/apex.go index 5118a0abb..44387cd59 100644 --- a/android/apex.go +++ b/android/apex.go @@ -17,8 +17,6 @@ package android import ( "sort" "sync" - - "github.com/google/blueprint" ) // ApexModule is the interface that a module type is expected to implement if @@ -69,7 +67,7 @@ type ApexModule interface { // Mutate this module into one or more variants each of which is built // for an APEX marked via BuildForApex(). - CreateApexVariations(mctx BottomUpMutatorContext) []blueprint.Module + CreateApexVariations(mctx BottomUpMutatorContext) []Module // Sets the name of the apex variant of this module. Called inside // CreateApexVariations. @@ -176,7 +174,7 @@ func (m *ApexModuleBase) checkApexAvailableProperty(mctx BaseModuleContext) { } } -func (m *ApexModuleBase) CreateApexVariations(mctx BottomUpMutatorContext) []blueprint.Module { +func (m *ApexModuleBase) CreateApexVariations(mctx BottomUpMutatorContext) []Module { if len(m.apexVariations) > 0 { m.checkApexAvailableProperty(mctx) sort.Strings(m.apexVariations) -- cgit v1.2.3-59-g8ed1b