|
@@ -187,12 +187,12 @@ func TestDataLibsRelativeInstallPath(t *testing.T) {
|
|
|
t.Errorf("expected test output file to be 'main_test', but was '%s'", outputPath)
|
|
|
}
|
|
|
entries := android.AndroidMkEntriesForTest(t, ctx, module)[0]
|
|
|
- if !strings.HasSuffix(entries.EntryMap["LOCAL_TEST_DATA"][0], ":test_lib.so:foo/bar/baz") {
|
|
|
- t.Errorf("expected LOCAL_TEST_DATA to end with `:test_lib.so:foo/bar/baz`,"+
|
|
|
+ if !strings.HasSuffix(entries.EntryMap["LOCAL_TEST_DATA"][0], ":test_lib.so:lib64/foo/bar/baz") {
|
|
|
+ t.Errorf("expected LOCAL_TEST_DATA to end with `:test_lib.so:lib64/foo/bar/baz`,"+
|
|
|
" but was '%s'", entries.EntryMap["LOCAL_TEST_DATA"][0])
|
|
|
}
|
|
|
- if !strings.HasSuffix(entries.EntryMap["LOCAL_TEST_DATA"][1], ":librust_test_lib.so:foo/bar/baz") {
|
|
|
- t.Errorf("expected LOCAL_TEST_DATA to end with `:librust_test_lib.so:foo/bar/baz`,"+
|
|
|
+ if !strings.HasSuffix(entries.EntryMap["LOCAL_TEST_DATA"][1], ":librust_test_lib.so:lib64/foo/bar/baz") {
|
|
|
+ t.Errorf("expected LOCAL_TEST_DATA to end with `:librust_test_lib.so:lib64/foo/bar/baz`,"+
|
|
|
" but was '%s'", entries.EntryMap["LOCAL_TEST_DATA"][1])
|
|
|
}
|
|
|
if !strings.HasSuffix(entries.EntryMap["LOCAL_TEST_DATA"][2], ":rusty:foo/bar/baz") {
|