diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2015-06-11 21:54:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-11 21:55:09 +0000 |
| commit | ae1e75458ad281f121116c8c5dfe9d8086e43a2b (patch) | |
| tree | 9fd99a761b59b0308d2845ebd50ba7e7d0a64bfc /tests | |
| parent | 38263dd91a4b68e2ad0afe458c9a20cb360dafeb (diff) | |
| parent | 524f1f1efe0cb32714c61e26f21701ac952b9e42 (diff) | |
| download | bionic-ae1e75458ad281f121116c8c5dfe9d8086e43a2b.zip bionic-ae1e75458ad281f121116c8c5dfe9d8086e43a2b.tar.gz bionic-ae1e75458ad281f121116c8c5dfe9d8086e43a2b.tar.bz2 | |
Merge "Make path to apk compliant with jar url format" into mnc-dev
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/dlext_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/dlext_test.cpp b/tests/dlext_test.cpp index 56a8f6f..f901708 100644 --- a/tests/dlext_test.cpp +++ b/tests/dlext_test.cpp @@ -214,7 +214,7 @@ TEST(dlext, android_dlopen_ext_force_load_soname_exception) { TEST(dlfcn, dlopen_from_zip_absolute_path) { const std::string lib_path = std::string(getenv("ANDROID_DATA")) + LIBZIPPATH; - void* handle = dlopen((lib_path + "!libdir/libdlext_test_fd.so").c_str(), RTLD_NOW); + void* handle = dlopen((lib_path + "!/libdir/libdlext_test_fd.so").c_str(), RTLD_NOW); ASSERT_TRUE(handle != nullptr) << dlerror(); int (*fn)(void); @@ -226,7 +226,7 @@ TEST(dlfcn, dlopen_from_zip_absolute_path) { } TEST(dlfcn, dlopen_from_zip_ld_library_path) { - const std::string lib_path = std::string(getenv("ANDROID_DATA")) + LIBZIPPATH + "!libdir"; + const std::string lib_path = std::string(getenv("ANDROID_DATA")) + LIBZIPPATH + "!/libdir"; typedef void (*fn_t)(const char*); fn_t android_update_LD_LIBRARY_PATH = |