diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-10-31 07:11:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-31 07:11:42 +0000 |
| commit | 724c854f6a28a73191cd8ce1b1c0e5df4797decb (patch) | |
| tree | c310db7921965f2326bc4d82b869eac2fc214f5a /java/app_builder.go | |
| parent | 96ef45a3dda48cb120b4d89af11034089c859736 (diff) | |
| parent | c00cbd9e7b7fea712894aa361b3a8bce47e7c397 (diff) | |
| download | android_build_soong-724c854f6a28a73191cd8ce1b1c0e5df4797decb.tar.gz android_build_soong-724c854f6a28a73191cd8ce1b1c0e5df4797decb.tar.bz2 android_build_soong-724c854f6a28a73191cd8ce1b1c0e5df4797decb.zip | |
Merge "APEXs are signed with apk signer"
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 75774443..424aec85 100644 --- a/java/app_builder.go +++ b/java/app_builder.go @@ -29,7 +29,7 @@ import ( ) var ( - signapk = pctx.AndroidStaticRule("signapk", + Signapk = pctx.AndroidStaticRule("signapk", blueprint.RuleParams{ Command: `${config.JavaCmd} -Djava.library.path=$$(dirname $signapkJniLibrary) ` + `-jar $signapkCmd $certificates $in $out`, @@ -63,7 +63,7 @@ var combineApk = pctx.AndroidStaticRule("combineApk", }) func CreateAppPackage(ctx android.ModuleContext, outputFile android.WritablePath, - resJarFile, jniJarFile, dexJarFile android.Path, certificates []certificate) { + resJarFile, jniJarFile, dexJarFile android.Path, certificates []Certificate) { unsignedApk := android.PathForModuleOut(ctx, "unsigned.apk") @@ -84,11 +84,11 @@ func CreateAppPackage(ctx android.ModuleContext, outputFile android.WritablePath var certificateArgs []string for _, c := range certificates { - certificateArgs = append(certificateArgs, c.pem.String(), c.key.String()) + certificateArgs = append(certificateArgs, c.Pem.String(), c.Key.String()) } ctx.Build(pctx, android.BuildParams{ - Rule: signapk, + Rule: Signapk, Description: "signapk", Output: outputFile, Input: unsignedApk, |