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

Merge "Fix tests for cc_prebuilt_library bp2build" am: 2e7c82ea0b am: 5d9a85745b

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

Change-Id: I4132dd4c42c32e25112f73311a1c2ca945a3fc30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Trevor Radcliffe
2022-04-20 15:18:19 +00:00
committed by Automerger Merge Worker
parent 8e6112a4b1 5d9a85745b
commit 4065592b87
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bp2build/Android.bp
View File

@@ -45,7 +45,9 @@ bootstrap_go_package {
"cc_library_shared_conversion_test.go",
"cc_library_static_conversion_test.go",
"cc_object_conversion_test.go",
"cc_prebuilt_library_conversion_test.go",
"cc_prebuilt_library_shared_test.go",
"cc_prebuilt_library_static_test.go",
"conversion_test.go",
"filegroup_conversion_test.go",
"genrule_conversion_test.go",

4
bp2build/cc_prebuilt_library_conversion_test.go
View File

@@ -136,7 +136,7 @@ cc_prebuilt_library {
},
bazel_module: { bp2build_available: true },
}`,
expectedErr: fmt.Errorf("Expected at most once source file"),
expectedErr: fmt.Errorf("Expected at most one source file"),
})
}
@@ -159,7 +159,7 @@ cc_prebuilt_library {
},
bazel_module: { bp2build_available: true },
}`,
expectedErr: fmt.Errorf("Expected at most once source file"),
expectedErr: fmt.Errorf("Expected at most one source file"),
})
}