diff options
| author | Tim Murray <timmurray@google.com> | 2014-09-10 23:38:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-10 23:38:18 +0000 |
| commit | 97c10ec3ad02572a66605d77dcf8f471b3e7125c (patch) | |
| tree | db3f394dad060cd0112dbf113991270d7e84137c /rsContext.cpp | |
| parent | c503150963e76e6d55153b8d45d884750513effb (diff) | |
| parent | 6e6cdbc303bef581cfb7d1fd0902cb42c89010cc (diff) | |
am 6e6cdbc3: Add flag to disable 64-bit driver.
* commit '6e6cdbc303bef581cfb7d1fd0902cb42c89010cc':
Add flag to disable 64-bit driver.
Diffstat (limited to 'rsContext.cpp')
| -rw-r--r-- | rsContext.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/rsContext.cpp b/rsContext.cpp index 253182c3..e7ff33de 100644 --- a/rsContext.cpp +++ b/rsContext.cpp @@ -333,12 +333,16 @@ void * Context::threadProc(void *vrsc) { } else if (rsc->getContextType() == RS_CONTEXT_TYPE_DEBUG) { ALOGV("Application requested debug context"); } else { +#if defined(__LP64__) && defined(DISABLE_RS_64_BIT_DRIVER) + // skip load +#else if (loadRuntime(OVERRIDE_RS_DRIVER_STRING, rsc)) { ALOGV("Successfully loaded runtime: %s", OVERRIDE_RS_DRIVER_STRING); loadDefault = false; } else { ALOGE("Failed to load runtime %s, loading default", OVERRIDE_RS_DRIVER_STRING); } +#endif } #undef XSTR |