Revert "Port uses-shared library verification and dexpreopting to Soong"
This reverts commit b66d7b1c20
.
Reason for revert: broke unbundled builds
Change-Id: I96ae287885107079de4a26e6b100ad8ed66961c0
This commit is contained in:
@@ -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)
|
||||
|
Reference in New Issue
Block a user