Error out if skip_preprocessed_apk_checks is set when it's not necessary

So that we don't erroneously add skip_preprocessed_apk_checks
everywhere.

Bug: 185811447
Test: Presubmits
Change-Id: Icb1c6163d170ca4181c5c6a814b51fda4777746f
This commit is contained in:
Cole Faust
2023-09-06 16:11:44 -07:00
parent 2f681324c2
commit 9c5c09f0ad
5 changed files with 110 additions and 135 deletions

View File

@@ -659,14 +659,19 @@ func TestAndroidAppImport_Preprocessed(t *testing.T) {
apkName := "foo.apk"
variant := ctx.ModuleForTests("foo", "android_common")
outputBuildParams := variant.Output("validated-prebuilt/" + apkName).BuildParams
outputBuildParams := variant.Output(apkName).BuildParams
if outputBuildParams.Rule.String() != android.Cp.String() {
t.Errorf("Unexpected prebuilt android_app_import rule: " + outputBuildParams.Rule.String())
}
// Make sure compression and aligning were validated.
if len(outputBuildParams.Validations) != 2 {
t.Errorf("Expected compression/alignment validation rules, found %d validations", len(outputBuildParams.Validations))
if outputBuildParams.Validation == nil {
t.Errorf("Expected validation rule, but was not found")
}
validationBuildParams := variant.Output("validated-prebuilt/check.stamp").BuildParams
if validationBuildParams.Rule.String() != checkPresignedApkRule.String() {
t.Errorf("Unexpected validation rule: " + validationBuildParams.Rule.String())
}
}