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

Merge "Remove uses of buildDir from java/dexpreopt_bootjars_test.go" am: 1b095e5177

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649795

Change-Id: Id022d82b5ee429ad62290dfb97ad83044ae0cf94
This commit is contained in:
Paul Duffin
2021-03-24 08:28:32 +00:00
committed by Automerger Merge Worker
parent 9c976257f7 1b095e5177
commit cf0f595e90
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/dexpreopt_bootjars_test.go
View File

@@ -54,11 +54,11 @@ func testDexpreoptBoot(t *testing.T, ruleFile string, expectedInputs, expectedOu
rule := dexpreoptBootJars.Output(ruleFile)
for i := range expectedInputs {
expectedInputs[i] = filepath.Join(buildDir, "test_device", expectedInputs[i])
expectedInputs[i] = filepath.Join("out/soong/test_device", expectedInputs[i])
}
for i := range expectedOutputs {
expectedOutputs[i] = filepath.Join(buildDir, "test_device", expectedOutputs[i])
expectedOutputs[i] = filepath.Join("out/soong/test_device", expectedOutputs[i])
}
inputs := rule.Implicits.Strings()
@@ -69,9 +69,9 @@ func testDexpreoptBoot(t *testing.T, ruleFile string, expectedInputs, expectedOu
sort.Strings(outputs)
sort.Strings(expectedOutputs)
android.AssertDeepEquals(t, "inputs", expectedInputs, inputs)
android.AssertStringPathsRelativeToTopEquals(t, "inputs", result.Config, expectedInputs, inputs)
android.AssertDeepEquals(t, "outputs", expectedOutputs, outputs)
android.AssertStringPathsRelativeToTopEquals(t, "outputs", result.Config, expectedOutputs, outputs)
}
func TestDexpreoptBootJars(t *testing.T) {
@@ -107,7 +107,7 @@ func TestDexpreoptBootJars(t *testing.T) {
func TestDexpreoptBootZip(t *testing.T) {
ruleFile := "boot.zip"
ctx := android.PathContextForTesting(testConfig(nil, "", nil))
ctx := android.PathContextForTesting(android.TestArchConfig("", nil, "", nil))
expectedInputs := []string{}
for _, target := range ctx.Config().Targets[android.Android] {
for _, ext := range []string{".art", ".oat", ".vdex"} {