commit 0e99097b400ccf69d3092bc993e8644be5d50c85
author Stephen Hines <srhines@google.com> Wed Jul 29 17:45:50 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jul 29 17:45:50 2015 +0000
tree 006647fa15903e09e5d3bf65d231779216e8dcec
parent 48c05e18e2eb8334b094b9ad8807c022beaea079
parent 7955d942d98882082983b649bca7cacda2092309

am 7955d942: am d5e8c3c9: Merge "Fix missing call to setLinkRuntimeCallback() from compat path."

* commit '7955d942d98882082983b649bca7cacda2092309':
  Fix missing call to setLinkRuntimeCallback() from compat path.

lib/Renderscript/RSCompilerDriver.cpp

diff --git a/lib/Renderscript/RSCompilerDriver.cpp b/lib/Renderscript/RSCompilerDriver.cpp
index 77478d9..b9a32c1 100644
--- a/lib/Renderscript/RSCompilerDriver.cpp
+++ b/lib/Renderscript/RSCompilerDriver.cpp
@@ -379,6 +379,7 @@
 
   pScript.setEmbedGlobalInfo(mEmbedGlobalInfo);
   pScript.setEmbedGlobalInfoSkipConstant(mEmbedGlobalInfoSkipConstant);
+  pScript.setLinkRuntimeCallback(getLinkRuntimeCallback());
 
   Compiler::ErrorCode status = compileScript(pScript, pOut, pOut, pRuntimePath,
                                              pBuildChecksum, pDumpIR);