From 2093af23c06429f5dd22dbae5d47ef800a9fb379 Mon Sep 17 00:00:00 2001 From: Ivan Lozano Date: Tue, 25 Aug 2020 12:48:19 -0400 Subject: [rust] Pass cc dependencies as linker flags. In order to support cc dependencies which do not start with the 'lib' prefix, we can't pass them through the -l flag. Instead, we can pass them directly to linker flags. Bug: 166151658 Test: cd external/rust/; mma Test: cd external/crosvm/; mma Test: Test linking to a cc dep that does not begin with 'lib' Change-Id: I5acbf3d3405e66446f3eae600b35683c4eb3d8a5 --- rust/rust_test.go | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'rust/rust_test.go') diff --git a/rust/rust_test.go b/rust/rust_test.go index 04de48b19..f1a08a805 100644 --- a/rust/rust_test.go +++ b/rust/rust_test.go @@ -132,25 +132,6 @@ func testRustError(t *testing.T, pattern string, bp string) { t.Fatalf("missing expected error %q (0 errors are returned)", pattern) } -// Test that we can extract the lib name from a lib path. -func TestLibNameFromFilePath(t *testing.T) { - libBarPath := android.PathForTesting("out/soong/.intermediates/external/libbar/libbar/linux_glibc_x86_64_shared/libbar.so.so") - libLibPath := android.PathForTesting("out/soong/.intermediates/external/libbar/libbar/linux_glibc_x86_64_shared/liblib.dylib.so") - - libBarName := libNameFromFilePath(libBarPath) - libLibName := libNameFromFilePath(libLibPath) - - expectedResult := "bar.so" - if libBarName != expectedResult { - t.Errorf("libNameFromFilePath returned the wrong name; expected '%#v', got '%#v'", expectedResult, libBarName) - } - - expectedResult = "lib.dylib" - if libLibName != expectedResult { - t.Errorf("libNameFromFilePath returned the wrong name; expected '%#v', got '%#v'", expectedResult, libLibPath) - } -} - // Test that we can extract the link path from a lib path. func TestLinkPathFromFilePath(t *testing.T) { barPath := android.PathForTesting("out/soong/.intermediates/external/libbar/libbar/linux_glibc_x86_64_shared/libbar.so") -- cgit v1.2.3-59-g8ed1b