diff options
| author | 2019-05-29 20:28:47 +0000 | |
|---|---|---|
| committer | 2019-05-29 20:28:47 +0000 | |
| commit | c03249833603dc57617ec603d7939fce621c474c (patch) | |
| tree | 53fc8acabdb8c09874933db962ac1ff450829d05 /java/app_builder.go | |
| parent | b66d7b1c20f7e54a5920780ba6643e971d216d31 (diff) | |
Revert "Port uses-shared library verification and dexpreopting to Soong"
This reverts commit b66d7b1c20f7e54a5920780ba6643e971d216d31.
Reason for revert: broke unbundled builds
Change-Id: I96ae287885107079de4a26e6b100ad8ed66961c0
Diffstat (limited to 'java/app_builder.go')
| -rw-r--r-- | java/app_builder.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/java/app_builder.go b/java/app_builder.go index fa77bbf1d..82a390f64 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, deps android.Paths) { + packageFile, jniJarFile, dexJarFile android.Path, certificates []Certificate) { unsignedApkName := strings.TrimSuffix(outputFile.Base(), ".apk") + "-unsigned.apk" unsignedApk := android.PathForModuleOut(ctx, unsignedApkName) @@ -78,10 +78,9 @@ func CreateAndSignAppPackage(ctx android.ModuleContext, outputFile android.Writa } ctx.Build(pctx, android.BuildParams{ - Rule: combineApk, - Inputs: inputs, - Output: unsignedApk, - Implicits: deps, + Rule: combineApk, + Inputs: inputs, + Output: unsignedApk, }) SignAppPackage(ctx, outputFile, unsignedApk, certificates) |