StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enable prebuilt apk checks"

Browse Source
This commit is contained in:
Treehugger Robot
2023-05-05 01:30:35 +00:00
committed by Gerrit Code Review
parent da8ebf235c ccb20f47d5
commit ee6bd5a7b2
2 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
java/app_import.go
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) {

45
java/app_import_test.go
View File

@@ -657,29 +657,28 @@ func TestAndroidTestImport_Preprocessed(t *testing.T) {
}
}
// TODO(b/185811447) Uncomment this after all existing failing apks set skip_preprocessed_apk_checks: true
//func TestAndroidAppImport_Preprocessed(t *testing.T) {
// ctx, _ := testJava(t, `
// android_app_import {
// name: "foo",
// apk: "prebuilts/apk/app.apk",
// presigned: true,
// preprocessed: true,
// }
// `)
//
// apkName := "foo.apk"
// variant := ctx.ModuleForTests("foo", "android_common")
// outputBuildParams := variant.Output("validated-prebuilt/" + 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))
// }
//}
func TestAndroidAppImport_Preprocessed(t *testing.T) {
ctx, _ := testJava(t, `
android_app_import {
name: "foo",
apk: "prebuilts/apk/app.apk",
presigned: true,
preprocessed: true,
}
`)
apkName := "foo.apk"
variant := ctx.ModuleForTests("foo", "android_common")
outputBuildParams := variant.Output("validated-prebuilt/" + 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))
}
}
func TestAndroidTestImport_UncompressDex(t *testing.T) {
testCases := []struct {