Do not run zipalign when building APK.
This changes the build system to no longer run zipalign when signapk
is also run. Running zipalign is no longer needed because signapk
takes care of alignment.
Bug: 25794543
Change-Id: I7bb43421c993bf32f09b0acce2a652376378964f
diff --git a/java/app_builder.go b/java/app_builder.go
index 4b3d315..849abfd 100644
--- a/java/app_builder.go
+++ b/java/app_builder.go
@@ -56,14 +56,6 @@
},
"aaptFlags")
- zipalign = pctx.StaticRule("zipalign",
- blueprint.RuleParams{
- Command: `$zipalignCmd -f $zipalignFlags 4 $in $out`,
- CommandDeps: []string{"$zipalignCmd"},
- Description: "zipalign $out",
- },
- "zipalignFlags")
-
signapk = pctx.StaticRule("signapk",
blueprint.RuleParams{
Command: `java -jar $signapkCmd $certificates $in $out`,
@@ -87,9 +79,6 @@
pctx.VariableFunc("aaptCmd", func(c interface{}) (string, error) {
return c.(common.Config).HostBinTool("aapt")
})
- pctx.VariableFunc("zipalignCmd", func(c interface{}) (string, error) {
- return c.(common.Config).HostBinTool("zipalign")
- })
pctx.VariableFunc("signapkCmd", func(c interface{}) (string, error) {
return c.(common.Config).HostJavaTool("signapk.jar")
})
@@ -147,7 +136,7 @@
},
})
- signedApk := filepath.Join(common.ModuleOutDir(ctx), "signed.apk")
+ outputFile := filepath.Join(common.ModuleOutDir(ctx), "package.apk")
var certificateArgs []string
for _, c := range certificates {
@@ -156,23 +145,12 @@
ctx.Build(pctx, blueprint.BuildParams{
Rule: signapk,
- Outputs: []string{signedApk},
+ Outputs: []string{outputFile},
Inputs: []string{resourceApk},
Args: map[string]string{
"certificates": strings.Join(certificateArgs, " "),
},
})
- outputFile := filepath.Join(common.ModuleOutDir(ctx), "package.apk")
-
- ctx.Build(pctx, blueprint.BuildParams{
- Rule: zipalign,
- Outputs: []string{outputFile},
- Inputs: []string{signedApk},
- Args: map[string]string{
- "zipalignFlags": "",
- },
- })
-
return outputFile
}