From e1731a580334cce7fc36dfc01f9ecf8f5a9396fb Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 14 Dec 2017 11:22:55 -0800 Subject: Export app certificates to Make for apkcerts list Bug: 70669383 Test: m apkcerts-list contains framework-res.apk Change-Id: I38af458e4262371c9c8368b5eebcff063a9bc359 --- java/app_builder.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'java/app_builder.go') 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 -- cgit v1.2.3-59-g8ed1b