commit 6e6cdbc303bef581cfb7d1fd0902cb42c89010cc
author Tim Murray <timmurray@google.com> Wed Sep 10 15:58:54 2014 -0700
committer Tim Murray <timmurray@google.com> Wed Sep 10 16:10:21 2014 -0700
tree 8d01735ed73711a6d4beb4614f2725bcfc658d08
parent cbbac9f5916b9253d88bc10c3661b1ecaa80afd8

Add flag to disable 64-bit driver.

bug 17428047

Change-Id: I888dd310449bf9079e352cb4aef31344c05b0ba8

rsContext.cpp

diff --git a/rsContext.cpp b/rsContext.cpp
index 2112ace..e1a7c71 100644
--- a/rsContext.cpp
+++ b/rsContext.cpp
@@ -333,12 +333,16 @@
     } 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