diff options
| author | Jaewoong Jung <jungjw@google.com> | 2019-04-15 09:48:31 -0700 |
|---|---|---|
| committer | Rashed Abdel-Tawab <rashed@linux.com> | 2019-09-27 20:30:59 -0700 |
| commit | 10944252b2237cf5950d1fea443603f9603d394e (patch) | |
| tree | b8df08fab05f4b8e1bf4b51ddebec2f4f149c7c3 /java/app_builder.go | |
| parent | b073f3cd7bf3af2e4220a83d2627234bd08315cf (diff) | |
| download | build_soong-10944252b2237cf5950d1fea443603f9603d394e.tar.gz build_soong-10944252b2237cf5950d1fea443603f9603d394e.tar.bz2 build_soong-10944252b2237cf5950d1fea443603f9603d394e.zip | |
Add android_app_import.
This is an initial version that handles the most basic cases.
Bug: 128610294
Test: app_test.go + prebuilt webview.apk
Change-Id: Ic525559aad5612987e50aa75b326b77b23acb716
Diffstat (limited to 'java/app_builder.go')
| -rw-r--r-- | java/app_builder.go | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/java/app_builder.go b/java/app_builder.go index 5bacb677..82a390f6 100644 --- a/java/app_builder.go +++ b/java/app_builder.go @@ -62,7 +62,7 @@ var combineApk = pctx.AndroidStaticRule("combineApk", CommandDeps: []string{"${config.MergeZipsCmd}"}, }) -func CreateAppPackage(ctx android.ModuleContext, outputFile android.WritablePath, +func CreateAndSignAppPackage(ctx android.ModuleContext, outputFile android.WritablePath, packageFile, jniJarFile, dexJarFile android.Path, certificates []Certificate) { unsignedApkName := strings.TrimSuffix(outputFile.Base(), ".apk") + "-unsigned.apk" @@ -83,6 +83,11 @@ func CreateAppPackage(ctx android.ModuleContext, outputFile android.WritablePath Output: unsignedApk, }) + SignAppPackage(ctx, outputFile, unsignedApk, certificates) +} + +func SignAppPackage(ctx android.ModuleContext, signedApk android.WritablePath, unsignedApk android.Path, certificates []Certificate) { + var certificateArgs []string var deps android.Paths for _, c := range certificates { @@ -93,7 +98,7 @@ func CreateAppPackage(ctx android.ModuleContext, outputFile android.WritablePath ctx.Build(pctx, android.BuildParams{ Rule: Signapk, Description: "signapk", - Output: outputFile, + Output: signedApk, Input: unsignedApk, Implicits: deps, Args: map[string]string{ |