openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Add a test for boot.zip (zip archive with boot image files)." am: 7bdb5e5aaa am: acdab217ac 

Change-Id: I0e3d9bd7c428a634a8912cca05d5ee1e2bbfef12
This commit is contained in:
Ulyana Trafimovich 2020-05-20 08:57:40 +00:00 committed by Automerger Merge Worker
parent 6697660b60 acdab217ac
commit ab254eb634
1 changed files with 80 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
java/dexpreopt_bootjars_test.go
View File

@ -24,7 +24,7 @@ import (
"android/soong/dexpreopt" "android/soong/dexpreopt"
) )
func TestDexpreoptBootJars(t *testing.T) { func testDexpreoptBoot(t *testing.T, ruleFile string, expectedInputs, expectedOutputs []string) {
bp := ` bp := `
java_sdk_library { java_sdk_library {
name: "foo", name: "foo",
@ -52,14 +52,39 @@ func TestDexpreoptBootJars(t *testing.T) {
dexpreopt.SetTestGlobalConfig(config, dexpreoptConfig) dexpreopt.SetTestGlobalConfig(config, dexpreoptConfig)
ctx := testContext() ctx := testContext()
RegisterDexpreoptBootJarsComponents(ctx) RegisterDexpreoptBootJarsComponents(ctx)
run(t, ctx, config) run(t, ctx, config)
dexpreoptBootJars := ctx.SingletonForTests("dex_bootjars") dexpreoptBootJars := ctx.SingletonForTests("dex_bootjars")
rule := dexpreoptBootJars.Output(ruleFile)
bootArt := dexpreoptBootJars.Output("boot-foo.art") for i := range expectedInputs {
expectedInputs[i] = filepath.Join(buildDir, "test_device", expectedInputs[i])
}
for i := range expectedOutputs {
expectedOutputs[i] = filepath.Join(buildDir, "test_device", expectedOutputs[i])
}
inputs := rule.Implicits.Strings()
sort.Strings(inputs)
sort.Strings(expectedInputs)
outputs := append(android.WritablePaths{rule.Output}, rule.ImplicitOutputs...).Strings()
sort.Strings(outputs)
sort.Strings(expectedOutputs)
if !reflect.DeepEqual(inputs, expectedInputs) {
t.Errorf("want inputs %q\n got inputs %q", expectedInputs, inputs)
}
if !reflect.DeepEqual(outputs, expectedOutputs) {
t.Errorf("want outputs %q\n got outputs %q", expectedOutputs, outputs)
}
}
func TestDexpreoptBootJars(t *testing.T) {
ruleFile := "boot-foo.art"
expectedInputs := []string{ expectedInputs := []string{
"dex_artjars/android/apex/com.android.art/javalib/arm64/boot.art", "dex_artjars/android/apex/com.android.art/javalib/arm64/boot.art",
@ -68,47 +93,71 @@ func TestDexpreoptBootJars(t *testing.T) {
"dex_bootjars_input/baz.jar", "dex_bootjars_input/baz.jar",
} }
for i := range expectedInputs {
expectedInputs[i] = filepath.Join(buildDir, "test_device", expectedInputs[i])
}
inputs := bootArt.Implicits.Strings()
sort.Strings(inputs)
sort.Strings(expectedInputs)
if !reflect.DeepEqual(inputs, expectedInputs) {
t.Errorf("want inputs %q\n got inputs %q", expectedInputs, inputs)
}
expectedOutputs := []string{ expectedOutputs := []string{
"dex_bootjars/android/system/framework/arm64/boot.invocation", "dex_bootjars/android/system/framework/arm64/boot.invocation",
"dex_bootjars/android/system/framework/arm64/boot-foo.art", "dex_bootjars/android/system/framework/arm64/boot-foo.art",
"dex_bootjars/android/system/framework/arm64/boot-bar.art", "dex_bootjars/android/system/framework/arm64/boot-bar.art",
"dex_bootjars/android/system/framework/arm64/boot-baz.art", "dex_bootjars/android/system/framework/arm64/boot-baz.art",
"dex_bootjars/android/system/framework/arm64/boot-foo.oat", "dex_bootjars/android/system/framework/arm64/boot-foo.oat",
"dex_bootjars/android/system/framework/arm64/boot-bar.oat", "dex_bootjars/android/system/framework/arm64/boot-bar.oat",
"dex_bootjars/android/system/framework/arm64/boot-baz.oat", "dex_bootjars/android/system/framework/arm64/boot-baz.oat",
"dex_bootjars/android/system/framework/arm64/boot-foo.vdex", "dex_bootjars/android/system/framework/arm64/boot-foo.vdex",
"dex_bootjars/android/system/framework/arm64/boot-bar.vdex", "dex_bootjars/android/system/framework/arm64/boot-bar.vdex",
"dex_bootjars/android/system/framework/arm64/boot-baz.vdex", "dex_bootjars/android/system/framework/arm64/boot-baz.vdex",
"dex_bootjars_unstripped/android/system/framework/arm64/boot-foo.oat", "dex_bootjars_unstripped/android/system/framework/arm64/boot-foo.oat",
"dex_bootjars_unstripped/android/system/framework/arm64/boot-bar.oat", "dex_bootjars_unstripped/android/system/framework/arm64/boot-bar.oat",
"dex_bootjars_unstripped/android/system/framework/arm64/boot-baz.oat", "dex_bootjars_unstripped/android/system/framework/arm64/boot-baz.oat",
} }
for i := range expectedOutputs { testDexpreoptBoot(t, ruleFile, expectedInputs, expectedOutputs)
expectedOutputs[i] = filepath.Join(buildDir, "test_device", expectedOutputs[i]) }
}
// Changes to the boot.zip structure may break the ART APK scanner.
outputs := append(android.WritablePaths{bootArt.Output}, bootArt.ImplicitOutputs...).Strings() func TestDexpreoptBootZip(t *testing.T) {
sort.Strings(outputs) ruleFile := "boot.zip"
sort.Strings(expectedOutputs)
expectedInputs := []string{
if !reflect.DeepEqual(outputs, expectedOutputs) { "dex_bootjars/android/system/framework/arm/boot-foo.art",
t.Errorf("want outputs %q\n got outputs %q", expectedOutputs, outputs) "dex_bootjars/android/system/framework/arm/boot-bar.art",
} "dex_bootjars/android/system/framework/arm/boot-baz.art",
"dex_bootjars/android/system/framework/arm/boot-foo.oat",
"dex_bootjars/android/system/framework/arm/boot-bar.oat",
"dex_bootjars/android/system/framework/arm/boot-baz.oat",
"dex_bootjars/android/system/framework/arm/boot-foo.vdex",
"dex_bootjars/android/system/framework/arm/boot-bar.vdex",
"dex_bootjars/android/system/framework/arm/boot-baz.vdex",
"dex_bootjars/android/system/framework/arm64/boot-foo.art",
"dex_bootjars/android/system/framework/arm64/boot-bar.art",
"dex_bootjars/android/system/framework/arm64/boot-baz.art",
"dex_bootjars/android/system/framework/arm64/boot-foo.oat",
"dex_bootjars/android/system/framework/arm64/boot-bar.oat",
"dex_bootjars/android/system/framework/arm64/boot-baz.oat",
"dex_bootjars/android/system/framework/arm64/boot-foo.vdex",
"dex_bootjars/android/system/framework/arm64/boot-bar.vdex",
"dex_bootjars/android/system/framework/arm64/boot-baz.vdex",
"dex_bootjars/linux_glibc/system/framework/x86/boot-foo.art",
"dex_bootjars/linux_glibc/system/framework/x86/boot-bar.art",
"dex_bootjars/linux_glibc/system/framework/x86/boot-baz.art",
"dex_bootjars/linux_glibc/system/framework/x86/boot-foo.oat",
"dex_bootjars/linux_glibc/system/framework/x86/boot-bar.oat",
"dex_bootjars/linux_glibc/system/framework/x86/boot-baz.oat",
"dex_bootjars/linux_glibc/system/framework/x86/boot-foo.vdex",
"dex_bootjars/linux_glibc/system/framework/x86/boot-bar.vdex",
"dex_bootjars/linux_glibc/system/framework/x86/boot-baz.vdex",
"dex_bootjars/linux_glibc/system/framework/x86_64/boot-foo.art",
"dex_bootjars/linux_glibc/system/framework/x86_64/boot-bar.art",
"dex_bootjars/linux_glibc/system/framework/x86_64/boot-baz.art",
"dex_bootjars/linux_glibc/system/framework/x86_64/boot-foo.oat",
"dex_bootjars/linux_glibc/system/framework/x86_64/boot-bar.oat",
"dex_bootjars/linux_glibc/system/framework/x86_64/boot-baz.oat",
"dex_bootjars/linux_glibc/system/framework/x86_64/boot-foo.vdex",
"dex_bootjars/linux_glibc/system/framework/x86_64/boot-bar.vdex",
"dex_bootjars/linux_glibc/system/framework/x86_64/boot-baz.vdex",
}
expectedOutputs := []string{
"dex_bootjars/boot.zip",
}
testDexpreoptBoot(t, ruleFile, expectedInputs, expectedOutputs)
} }