Enable prebuilt apk checks

Now that existing violations set the skip flag.

Bug: 185811447
Test: Presubmits
Change-Id: Ia513b71be1cd878f36fdb28c94ef3cdc3f2a6bc6
This commit is contained in:
Cole Faust
2023-05-04 12:38:24 -07:00
parent c0bdca9110
commit ccb20f47d5
2 changed files with 27 additions and 29 deletions

View File

@@ -335,12 +335,11 @@ func (a *AndroidAppImport) generateAndroidBuildActions(ctx android.ModuleContext
if proptools.Bool(a.properties.Preprocessed) {
output := srcApk
// TODO(b/185811447) Uncomment this after all existing failing apks set skip_preprocessed_apk_checks: true
//if !proptools.Bool(a.properties.Skip_preprocessed_apk_checks) {
// writableOutput := android.PathForModuleOut(ctx, "validated-prebuilt", apkFilename)
// a.validatePreprocessedApk(ctx, srcApk, writableOutput)
// output = writableOutput
//}
if !proptools.Bool(a.properties.Skip_preprocessed_apk_checks) {
writableOutput := android.PathForModuleOut(ctx, "validated-prebuilt", apkFilename)
a.validatePreprocessedApk(ctx, srcApk, writableOutput)
output = writableOutput
}
a.outputFile = output
a.certificate = PresignedCertificate
} else if !Bool(a.properties.Presigned) {