From b66d7b1c20f7e54a5920780ba6643e971d216d31 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 16 May 2019 12:28:22 -0700 Subject: Port uses-shared library verification and dexpreopting to Soong Ports 09f3b97f4b488cd3a7b7d72038b173575b02c162 (Add support for preopt with uses-libraries) from Make to Soong to support verifying and preopting shared libraries. Bug: 132357300 Test: app_test.go Test: m checkbuild Change-Id: Id25f55f07a55120bebe2a9b32c094209efc85c8b --- java/app_builder.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'java/app_builder.go') diff --git a/java/app_builder.go b/java/app_builder.go index 82a390f64..fa77bbf1d 100644 --- a/java/app_builder.go +++ b/java/app_builder.go @@ -63,7 +63,7 @@ var combineApk = pctx.AndroidStaticRule("combineApk", }) func CreateAndSignAppPackage(ctx android.ModuleContext, outputFile android.WritablePath, - packageFile, jniJarFile, dexJarFile android.Path, certificates []Certificate) { + packageFile, jniJarFile, dexJarFile android.Path, certificates []Certificate, deps android.Paths) { unsignedApkName := strings.TrimSuffix(outputFile.Base(), ".apk") + "-unsigned.apk" unsignedApk := android.PathForModuleOut(ctx, unsignedApkName) @@ -78,9 +78,10 @@ func CreateAndSignAppPackage(ctx android.ModuleContext, outputFile android.Writa } ctx.Build(pctx, android.BuildParams{ - Rule: combineApk, - Inputs: inputs, - Output: unsignedApk, + Rule: combineApk, + Inputs: inputs, + Output: unsignedApk, + Implicits: deps, }) SignAppPackage(ctx, outputFile, unsignedApk, certificates) -- cgit v1.2.3-59-g8ed1b