Merge "Make ScriptC's mEnvironment.mIsThreadable survive the bcc caching and then cache-reloading."

1 files changed, 6 insertions, 0 deletions

diff --git a/libs/rs/rsScriptC.cpp b/libs/rs/rsScriptC.cpp
index 6587b51627db..d4edafd4186b 100644
--- a/libs/rs/rsScriptC.cpp
+++ b/libs/rs/rsScriptC.cpp
@@ -378,6 +378,12 @@ void ScriptCState::clear(Context *rsc) {
 static BCCvoid* symbolLookup(BCCvoid* pContext, const BCCchar* name) {
     const ScriptCState::SymbolTable_t *sym;
     ScriptC *s = (ScriptC *)pContext;
+    if (!strcmp(name, "__isThreadable")) {
+      return (BCCvoid*) s->mEnviroment.mIsThreadable;
+    } else if (!strcmp(name, "__clearThreadable")) {
+      s->mEnviroment.mIsThreadable = false;
+      return NULL;
+    }
     sym = ScriptCState::lookupSymbol(name);
     if (!sym) {
         sym = ScriptCState::lookupSymbolCL(name);