diff options
| author | 2017-10-24 21:16:43 +0000 | |
|---|---|---|
| committer | 2017-10-24 21:16:43 +0000 | |
| commit | 17ae970a92a8e822631279ea8ff430a46d0735cf (patch) | |
| tree | 87595b96254f9ee5b8afe82b8348acec08248b4b /java/system_modules.go | |
| parent | 3615dcb30cb1db4e61dea229d70a360b26849475 (diff) | |
| parent | 0617bb85c6958da42c6bfc6cc9d3e92c3622d4b8 (diff) | |
Merge changes Id806633d,I05e945f3,Ieac84040,I18eb8cc0,If11c298e
* changes:
Fix missing source module with ALLOW_MISSING_DEPENDENCIES=true
Convert Visit*Deps from blueprint.Module to android.Module
Move first/last unique elements utility functions to android package
Move ModuleContext.ModuleBuild to ModuleContext.Build
Make android.ModuleContext not include blueprint.ModuleContext
Diffstat (limited to 'java/system_modules.go')
| -rw-r--r-- | java/system_modules.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/system_modules.go b/java/system_modules.go index ce66a7c1e..a459b7a0f 100644 --- a/java/system_modules.go +++ b/java/system_modules.go @@ -67,7 +67,7 @@ func TransformJarsToSystemModules(ctx android.ModuleContext, moduleName string, android.PathForModuleOut(ctx, "system/release"), } - ctx.ModuleBuild(pctx, android.ModuleBuildParams{ + ctx.Build(pctx, android.BuildParams{ Rule: jarsTosystemModules, Description: "system modules", Outputs: outputs, @@ -112,7 +112,7 @@ type SystemModulesProperties struct { func (system *SystemModules) GenerateAndroidBuildActions(ctx android.ModuleContext) { var jars android.Paths - ctx.VisitDirectDeps(func(module blueprint.Module) { + ctx.VisitDirectDeps(func(module android.Module) { if ctx.OtherModuleDependencyTag(module) == libTag { dep, _ := module.(Dependency) jars = append(jars, dep.HeaderJars()...) |