Enable prebuilt apk checks
Now that existing violations set the skip flag.
Bug: 185811447
Test: Presubmits
Change-Id: Ia513b71be1cd878f36fdb28c94ef3cdc3f2a6bc6
diff --git a/java/app_import.go b/java/app_import.go
index 52ae024..9c01960 100644
--- a/java/app_import.go
+++ b/java/app_import.go
@@ -335,12 +335,11 @@
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) {