summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreugenis@chromium.org <eugenis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-19 20:22:34 +0000
committereugenis@chromium.org <eugenis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-19 20:22:34 +0000
commitd81ac4a9d9025c85317d233dc8adb50cb5635921 (patch)
treee60021a338b1961e7b6e170198f8ed5785ab3fa8
parent0f9144c457b5dbee9c0b00019fdf4110767676c0 (diff)
downloadchromium_src-d81ac4a9d9025c85317d233dc8adb50cb5635921.zip
chromium_src-d81ac4a9d9025c85317d233dc8adb50cb5635921.tar.gz
chromium_src-d81ac4a9d9025c85317d233dc8adb50cb5635921.tar.bz2
Fix PathUtilsTest.TestGetNativeLibraryDirectory in components=shared_library build.
BUG=325685 R=bulach@chromium.org, pliard@chromium.org Review URL: https://codereview.chromium.org/172193002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252061 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--base/android/path_utils_unittest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/base/android/path_utils_unittest.cc b/base/android/path_utils_unittest.cc
index c4c12fe..b641075 100644
--- a/base/android/path_utils_unittest.cc
+++ b/base/android/path_utils_unittest.cc
@@ -39,7 +39,8 @@ TEST_F(PathUtilsTest, TestGetNativeLibraryDirectory) {
// the base tests shared object.
FilePath path;
GetNativeLibraryDirectory(&path);
- EXPECT_TRUE(base::PathExists(path.Append(("libbase_unittests.so"))));
+ EXPECT_TRUE(base::PathExists(path.Append(("libbase_unittests.so"))) ||
+ base::PathExists(path.Append(("libbase_unittests.cr.so"))));
}
} // namespace android