diff options
author | 2019-04-15 09:48:31 -0700 | |
---|---|---|
committer | 2019-05-01 10:06:47 -0700 | |
commit | ccbb3936513bddf95214f808a2b51fda24a205e2 (patch) | |
tree | abe1dd0c47831e57511b4cf07c1b7bf0255a55f4 /java/app_builder.go | |
parent | 23803f936554103047bafe5ff5d4999e49aa940e (diff) |
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 5bacb6776..82a390f64 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{ |