diff options
| author | 2020-06-03 17:14:31 +0000 | |
|---|---|---|
| committer | 2020-06-03 17:15:15 +0000 | |
| commit | b549b771207be2ffb6f705461110a1285c0b91f4 (patch) | |
| tree | 2b32753292b4cfe572780435c426d17bd5ff9f3f /java/builder.go | |
| parent | 91206d9ed1a1e3cb81d1ace021580c4be8362f1f (diff) | |
Revert "Always run package check"
This reverts commit 91206d9ed1a1e3cb81d1ace021580c4be8362f1f.
Reason for revert: package-check.sh doesn't work on mac
Bug: 158081251
Bug: 157649935
Change-Id: I50af71d54d5f1f8b516bfcf1efbcf6217e89c83a
Diffstat (limited to 'java/builder.go')
| -rw-r--r-- | java/builder.go | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/java/builder.go b/java/builder.go index 640dba93b..a27e5c390 100644 --- a/java/builder.go +++ b/java/builder.go @@ -206,7 +206,7 @@ var ( blueprint.RuleParams{ Command: "rm -f $out && " + "${config.PackageCheckCmd} $in $packages && " + - "cp $in $out", + "touch $out", CommandDeps: []string{"${config.PackageCheckCmd}"}, }, "packages") @@ -547,9 +547,8 @@ func TransformJarJar(ctx android.ModuleContext, outputFile android.WritablePath, }) } -func CheckJarPackages(ctx android.ModuleContext, classesJar android.Path, permittedPackages []string) android.ModuleOutPath { - outputFile := android.PathForModuleOut(ctx, "package-check", classesJar.Base()) - +func CheckJarPackages(ctx android.ModuleContext, outputFile android.WritablePath, + classesJar android.Path, permittedPackages []string) { ctx.Build(pctx, android.BuildParams{ Rule: packageCheck, Description: "packageCheck", @@ -559,8 +558,6 @@ func CheckJarPackages(ctx android.ModuleContext, classesJar android.Path, permit "packages": strings.Join(permittedPackages, " "), }, }) - - return outputFile } func TransformJetifier(ctx android.ModuleContext, outputFile android.WritablePath, |