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

Add OutputFilesProvider support for singleton

Browse Source 
This CL also changes to use OutputFilesProvider on rust module, which
has singleton involved.

Test: CI
Bug: 339477385
Bug: 348494466
Change-Id: Idc5c0fb9f8425f09184d5b73531ee3052e5a076c
This commit is contained in:
mrziwang
2024-06-20 16:39:25 -07:00
parent fe658ac53a
commit 0cbd3b0e79
3 changed files with 45 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
rust/test_test.go
View File

@@ -106,12 +106,9 @@ func TestDataLibs(t *testing.T) {
ctx := testRust(t, bp)
module := ctx.ModuleForTests("main_test", "android_arm64_armv8-a").Module()
testBinary := module.(*Module).compiler.(*testDecorator)
outputFiles, err := module.(android.OutputFileProducer).OutputFiles("")
if err != nil {
t.Fatalf("Expected rust_test to produce output files, error: %s", err)
}
testingModule := ctx.ModuleForTests("main_test", "android_arm64_armv8-a")
testBinary := testingModule.Module().(*Module).compiler.(*testDecorator)
outputFiles := testingModule.OutputFiles(t, "")
if len(outputFiles) != 1 {
t.Fatalf("expected exactly one output file. output files: [%s]", outputFiles)
}
@@ -168,12 +165,10 @@ func TestDataLibsRelativeInstallPath(t *testing.T) {
`
ctx := testRust(t, bp)
module := ctx.ModuleForTests("main_test", "android_arm64_armv8-a").Module()
testingModule := ctx.ModuleForTests("main_test", "android_arm64_armv8-a")
module := testingModule.Module()
testBinary := module.(*Module).compiler.(*testDecorator)
outputFiles, err := module.(android.OutputFileProducer).OutputFiles("")
if err != nil {
t.Fatalf("Expected rust_test to produce output files, error: %s", err)
}
outputFiles := testingModule.OutputFiles(t, "")
if len(outputFiles) != 1 {
t.Fatalf("expected exactly one output file. output files: [%s]", outputFiles)
}