diff options
| author | Colin Cross <ccross@android.com> | 2017-10-23 17:16:14 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-10-24 10:59:00 -0700 |
| commit | ae88703df55dcd721ccd5c3cca4c02c7b541ca9d (patch) | |
| tree | 709e9300f0a1b39eae10fe40255d569e042066e1 /java/app_builder.go | |
| parent | 3f68a1362b808117a30e8333ce9a96b6252af5da (diff) | |
| download | android_build_soong-ae88703df55dcd721ccd5c3cca4c02c7b541ca9d.tar.gz android_build_soong-ae88703df55dcd721ccd5c3cca4c02c7b541ca9d.tar.bz2 android_build_soong-ae88703df55dcd721ccd5c3cca4c02c7b541ca9d.zip | |
Move ModuleContext.ModuleBuild to ModuleContext.Build
Now that android.ModuleContext does not include blueprint.ModuleContext
we can rename android.ModuleContext.ModuleBuild to
android.ModuleContext.Build without colliding with
blueprint.ModuleContext.Build. Leave ModuleBuild as a wrapper around
Build for now to avoid having to update all the users outside
build/soong simultaneously.
Test: m checkbuild
Change-Id: I18eb8cc04faf002049a11d9aac97e9732ff5d638
Diffstat (limited to 'java/app_builder.go')
| -rw-r--r-- | java/app_builder.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/app_builder.go b/java/app_builder.go index 55fded57..ed7abce6 100644 --- a/java/app_builder.go +++ b/java/app_builder.go @@ -82,7 +82,7 @@ func CreateResourceJavaFiles(ctx android.ModuleContext, flags []string, publicResourcesFile := android.PathForModuleOut(ctx, "public_resources.xml") proguardOptionsFile := android.PathForModuleOut(ctx, "proguard.options") - ctx.ModuleBuild(pctx, android.ModuleBuildParams{ + ctx.Build(pctx, android.BuildParams{ Rule: aaptCreateResourceJavaFile, Description: "aapt create R.java", Outputs: android.WritablePaths{publicResourcesFile, proguardOptionsFile, javaFileList}, @@ -102,7 +102,7 @@ func CreateResourceJavaFiles(ctx android.ModuleContext, flags []string, func CreateExportPackage(ctx android.ModuleContext, flags []string, deps android.Paths) android.ModuleOutPath { outputFile := android.PathForModuleOut(ctx, "package-export.apk") - ctx.ModuleBuild(pctx, android.ModuleBuildParams{ + ctx.Build(pctx, android.BuildParams{ Rule: aaptCreateAssetsPackage, Description: "aapt export package", Output: outputFile, @@ -120,7 +120,7 @@ func CreateAppPackage(ctx android.ModuleContext, flags []string, jarFile android resourceApk := android.PathForModuleOut(ctx, "resources.apk") - ctx.ModuleBuild(pctx, android.ModuleBuildParams{ + ctx.Build(pctx, android.BuildParams{ Rule: aaptAddResources, Description: "aapt package", Output: resourceApk, @@ -137,7 +137,7 @@ func CreateAppPackage(ctx android.ModuleContext, flags []string, jarFile android certificateArgs = append(certificateArgs, c+".x509.pem", c+".pk8") } - ctx.ModuleBuild(pctx, android.ModuleBuildParams{ + ctx.Build(pctx, android.BuildParams{ Rule: signapk, Description: "signapk", Output: outputFile, |