diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-03-10 09:10:38 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-03-10 09:12:31 +0100 |
| commit | 00b57f59a17d0ad025215f1a8ce4e0c2a6c66ea0 (patch) | |
| tree | ee419c1cb134f96767f98872ef2aea544b3cdab4 /unotest | |
| parent | 3915ffc46fc063fa1f9be68c29a4157984f1bdb3 (diff) | |
Special case for ANDROID is supposed to no longer be needed
...see Miklos' comment at <https://gerrit.libreoffice.org/#/c/23078/1> "Extract
Directories from BootstrapFixtureBase."
Change-Id: Ib8bd52a9960e4631802e5649c97147c074adddc6
Diffstat (limited to 'unotest')
| -rw-r--r-- | unotest/source/cpp/directories.cxx | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/unotest/source/cpp/directories.cxx b/unotest/source/cpp/directories.cxx index 177ed2c6f337..55084a2e3d53 100644 --- a/unotest/source/cpp/directories.cxx +++ b/unotest/source/cpp/directories.cxx @@ -28,15 +28,10 @@ OUString getFileURLFromSystemPath(OUString const & path) { } test::Directories::Directories() { -#ifndef ANDROID const char* pSrcRoot = getenv( "SRC_ROOT" ); CPPUNIT_ASSERT_MESSAGE("SRC_ROOT env variable not set", pSrcRoot != nullptr && pSrcRoot[0] != 0); const char* pWorkdirRoot = getenv( "WORKDIR_FOR_BUILD" ); CPPUNIT_ASSERT_MESSAGE("$WORKDIR_FOR_BUILD env variable not set", pWorkdirRoot != nullptr && pWorkdirRoot[0] != 0); -#else - const char* pSrcRoot = "/assets"; - const char* pWorkdirRoot = "/assets"; -#endif m_aSrcRootPath = OUString::createFromAscii( pSrcRoot ); m_aSrcRootURL = getFileURLFromSystemPath(m_aSrcRootPath); |