Convert bionic dlext test zips to Android.bp
Use cc_genrules to create the dlext test zips needed by the bionic
tests. The genrules aren't visible to Make, and so don't work with
the `required` property. Move all of the dependencies to `data_bins`,
`data_libs` or `data` for helper binaries, shared libraries or
genrule zip files respectively. The `data*` properties copy the
files into the same directory as a test, respecting the
`bionic-loader-test-libs` relative path specified by each, but
does not put each helper binary in its own subdirectory, so update
the paths in each of the tests.
Bug: 200872604
Test: atest CtsBionicTestCases
Test: atest bionic-unit-tests
Test: cts-tradefed run commandAndExit cts -m CtsBionicTestCases
Test: adb push $OUT/data/nativetest/bionic-unit-tests /data/nativetest/ && adb shell /data/nativetest/bionic-unit-tests/bionic-unit-tests
Change-Id: Ic4257cb4104ff558326df2363730acd20464b051
diff --git a/tests/gtest_globals.cpp b/tests/gtest_globals.cpp
index 5b5ede8..11b2dff 100644
--- a/tests/gtest_globals.cpp
+++ b/tests/gtest_globals.cpp
@@ -25,8 +25,8 @@
std::string GetTestlibRoot() {
// 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() + "/..";
+ // test libraries are in /data/nativetest[64]/bionic-unit-tests/bionic-loader-test-libs.
+ std::string path = android::base::GetExecutableDirectory();
std::string out_path;
if (!android::base::Realpath(path.c_str(), &out_path)) {