diff options
author | 2017-12-14 11:22:55 -0800 | |
---|---|---|
committer | 2017-12-14 12:28:41 -0800 | |
commit | e1731a580334cce7fc36dfc01f9ecf8f5a9396fb (patch) | |
tree | 204286923ea9d862832336cd2be6ed26e0e69dac /java/app_builder.go | |
parent | 16056060d5e10fca2b3852022433cca488ff2d47 (diff) |
Export app certificates to Make for apkcerts list
Bug: 70669383
Test: m apkcerts-list contains framework-res.apk
Change-Id: I38af458e4262371c9c8368b5eebcff063a9bc359
Diffstat (limited to 'java/app_builder.go')
-rw-r--r-- | java/app_builder.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/app_builder.go b/java/app_builder.go index 676ed5853..945d7bdb3 100644 --- a/java/app_builder.go +++ b/java/app_builder.go @@ -61,7 +61,7 @@ var combineApk = pctx.AndroidStaticRule("combineApk", }) func CreateAppPackage(ctx android.ModuleContext, outputFile android.WritablePath, - resJarFile, dexJarFile android.Path, certificates []string) { + resJarFile, dexJarFile android.Path, certificates []certificate) { // TODO(ccross): JNI libs @@ -80,7 +80,7 @@ func CreateAppPackage(ctx android.ModuleContext, outputFile android.WritablePath var certificateArgs []string for _, c := range certificates { - certificateArgs = append(certificateArgs, c+".x509.pem", c+".pk8") + certificateArgs = append(certificateArgs, c.pem.String(), c.key.String()) } // TODO(ccross): sometimes uncompress dex |