diff options
| author | Justin DeMartino <jjdemartino@google.com> | 2020-09-21 13:23:58 -0700 |
|---|---|---|
| committer | Justin DeMartino <jjdemartino@google.com> | 2020-09-21 13:23:58 -0700 |
| commit | 7e4fe6a28b718ab97c08811566238af2893ca65b (patch) | |
| tree | 5413a5ec890b5a1ac4fbbe4548b5014e41a2591b /tests/gtest_globals.cpp | |
| parent | dcdcb3fa15004669823a3a118189d9d72ff30852 (diff) | |
| parent | ab08b955a34423d53b28a6210e7530e67241af4a (diff) | |
Merge SP1A.200921.001
Change-Id: Id2ab019914bb555dadf52c46b8403c0d5fb3c20a
Diffstat (limited to 'tests/gtest_globals.cpp')
| -rw-r--r-- | tests/gtest_globals.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/gtest_globals.cpp b/tests/gtest_globals.cpp index 4160237ab..5b5ede8d4 100644 --- a/tests/gtest_globals.cpp +++ b/tests/gtest_globals.cpp @@ -24,8 +24,9 @@ #include <string> std::string GetTestlibRoot() { - // Calculate ANDROID_DATA assuming the binary is in "$ANDROID_DATA/somedir/binary-dir/binary" - std::string path = android::base::Dirname(android::base::GetExecutablePath()) + "/.."; + // Typically the executable is /data/nativetest[64]/bionic-unit-tests/bionic-unit-tests, and the + // test libraries are in /data/nativetest[64]/bionic-loader-test-libs. + std::string path = android::base::GetExecutableDirectory() + "/.."; std::string out_path; if (!android::base::Realpath(path.c_str(), &out_path)) { |