am af6ee5b5: Merge "Work around compiler optimization"

* commit 'af6ee5b5bc446ef5a6f2bf41bc4f2e13657978be':
  Work around compiler optimization
This commit is contained in:
Dmitriy Ivanov 2015-06-23 22:17:08 +00:00 committed by Android Git Automerger
commit 0a9df9a13e

View File

@ -1,7 +1,15 @@
#include <dlfcn.h>
extern "C" void *dlopen_b() {
// TODO (dimitry): this is to work around http://b/20049306
// remove once it is fixed
static int dummy = 0;
// This is not supposed to succeed. Even though this library has DT_RUNPATH
// for libtest_dt_runpath_x.so, it is not taked into account for dlopen.
void *handle = dlopen("libtest_dt_runpath_x.so", RTLD_NOW);
return handle;
if (handle != nullptr) {
dummy++;
return handle;
}
return nullptr;
}