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

Remove uses of buildDir in java/androidmk_test.go

Browse Source 
Remove any uses, either direct (or indirect via testJavaConfig or
similar methods), of the package level buildDir variable from this
file.

Bug: 182885307
Test: m nothing
Change-Id: Ibb9520d1500fcef9a4348570926a07b5bb54bf8c
This commit is contained in:
Paul Duffin
2021-03-22 17:31:51 +00:00
parent 2f9e71e5ad
commit f04311cbc1
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
java/androidmk_test.go
View File

@@ -171,7 +171,7 @@ func TestJavaSdkLibrary_RequireXmlPermissionFile(t *testing.T) {
}
func TestImportSoongDexJar(t *testing.T) {
ctx, _ := testJava(t, `
result := PrepareForTestWithJavaDefaultModules.RunTestWithBp(t, `
java_import {
name: "my-java-import",
jars: ["a.jar"],
@@ -180,14 +180,10 @@ func TestImportSoongDexJar(t *testing.T) {
}
`)
mod := ctx.ModuleForTests("my-java-import", "android_common").Module()
entries := android.AndroidMkEntriesForTest(t, ctx, mod)[0]
expectedSoongDexJar := buildDir + "/.intermediates/my-java-import/android_common/dex/my-java-import.jar"
mod := result.Module("my-java-import", "android_common")
entries := android.AndroidMkEntriesForTest(t, result.TestContext, mod)[0]
expectedSoongDexJar := "out/soong/.intermediates/my-java-import/android_common/dex/my-java-import.jar"
actualSoongDexJar := entries.EntryMap["LOCAL_SOONG_DEX_JAR"]
if len(actualSoongDexJar) != 1 {
t.Errorf("LOCAL_SOONG_DEX_JAR incorrect len %d", len(actualSoongDexJar))
} else if actualSoongDexJar[0] != expectedSoongDexJar {
t.Errorf("LOCAL_SOONG_DEX_JAR mismatch, actual: %s, expected: %s", actualSoongDexJar[0], expectedSoongDexJar)
}
android.AssertStringPathsRelativeToTopEquals(t, "LOCAL_SOONG_DEX_JAR", result.Config, []string{expectedSoongDexJar}, actualSoongDexJar)
}