summaryrefslogtreecommitdiff
path: root/libs/rs
diff options
context:
space:
mode:
author Shih-wei Liao <sliao@google.com> 2011-01-20 23:10:39 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2011-01-20 23:10:39 -0800
commitf1f710538e4d6388611145e66afc9dd934fa97cc (patch)
treeb2684d82bd81a5fb7206f5ec2198f1aa2d930d32 /libs/rs
parentccbdf5e838eb44a1920c2c02fcf4190880a3c540 (diff)
parent040d7d8ce765b1ee69cf6531181b2a33e9e83537 (diff)
Merge "Handle fatal errors from calling bccRegisterSymbolCallback (if any)." into honeycomb
Diffstat (limited to 'libs/rs')
-rw-r--r--libs/rs/rsScriptC.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/libs/rs/rsScriptC.cpp b/libs/rs/rsScriptC.cpp
index 1fceb663527f..eecfa16b43a4 100644
--- a/libs/rs/rsScriptC.cpp
+++ b/libs/rs/rsScriptC.cpp
@@ -475,7 +475,10 @@ bool ScriptCState::runCompiler(Context *rsc,
s->mEnviroment.mIsThreadable = true;
- bccRegisterSymbolCallback(s->mBccScript, symbolLookup, s);
+ if (bccRegisterSymbolCallback(s->mBccScript, symbolLookup, s) != 0) {
+ LOGE("bcc: FAILS to register symbol callback");
+ return false;
+ }
if (bccReadBC(s->mBccScript,
resName,