diff options
| author | 2019-11-25 22:30:17 +0000 | |
|---|---|---|
| committer | 2019-11-25 22:30:17 +0000 | |
| commit | 09ef474b6f797eb4f81e65b1736be30fbb3dd9cf (patch) | |
| tree | bf03e0eab4434dc6defff90cbe0d0a23e3b78403 /android/apex.go | |
| parent | 4b49b768a2cb7d455aea5347d27d9045b8c481fa (diff) | |
| parent | 7228ecd5e3c9282e7e6f4a81d81fd333cb08eaff (diff) | |
Merge changes I0dcc9c7b,I9bc40642
* changes:
Move cc.imageMutator into the android package
Make CreateVariations return []android.Module
Diffstat (limited to 'android/apex.go')
| -rw-r--r-- | android/apex.go | 6 |
1 files changed, 2 insertions, 4 deletions
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) |