diff options
| author | Yang Ni <yangni@google.com> | 2015-04-15 16:43:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-15 16:43:44 +0000 |
| commit | 3f57467424264d6f1aa784fb911d7d3ac1861009 (patch) | |
| tree | b2910bc9fbe30cb562ab2ab8957df5c9f5a7bc13 | |
| parent | d249de3fe2de53e020f3a14424b76ea3dfb5be7c (diff) | |
| parent | 83011d07649b7a720ef3fac9d61bcac02b3868ee (diff) | |
| download | android_frameworks_compile_libbcc-3f57467424264d6f1aa784fb911d7d3ac1861009.tar.gz android_frameworks_compile_libbcc-3f57467424264d6f1aa784fb911d7d3ac1861009.tar.bz2 android_frameworks_compile_libbcc-3f57467424264d6f1aa784fb911d7d3ac1861009.zip | |
am 83011d07: am 51cd0298: am 65fb05fe: Merge "Embed a real chesksum in script group .so"
* commit '83011d07649b7a720ef3fac9d61bcac02b3868ee':
Embed a real chesksum in script group .so
| -rw-r--r-- | include/bcc/Renderscript/RSCompilerDriver.h | 2 | ||||
| -rw-r--r-- | lib/Renderscript/RSCompilerDriver.cpp | 4 | ||||
| -rw-r--r-- | tools/bcc/Main.cpp | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/include/bcc/Renderscript/RSCompilerDriver.h b/include/bcc/Renderscript/RSCompilerDriver.h index b33ff2b..103d12e 100644 --- a/include/bcc/Renderscript/RSCompilerDriver.h +++ b/include/bcc/Renderscript/RSCompilerDriver.h @@ -115,7 +115,7 @@ public: bool buildScriptGroup( BCCContext& Context, const char* pOutputFilepath, const char* pRuntimePath, - const char* pRuntimeRelaxedPath, bool dumpIR, + const char* pRuntimeRelaxedPath, bool dumpIR, const char* buildChecksum, const std::vector<Source*>& sources, const std::list<std::list<std::pair<int, int>>>& toFuse, const std::list<std::string>& fused, diff --git a/lib/Renderscript/RSCompilerDriver.cpp b/lib/Renderscript/RSCompilerDriver.cpp index 903e056..09e144a 100644 --- a/lib/Renderscript/RSCompilerDriver.cpp +++ b/lib/Renderscript/RSCompilerDriver.cpp @@ -269,7 +269,7 @@ bool RSCompilerDriver::build(BCCContext &pContext, bool RSCompilerDriver::buildScriptGroup( BCCContext& Context, const char* pOutputFilepath, const char* pRuntimePath, - const char* pRuntimeRelaxedPath, bool dumpIR, + const char* pRuntimeRelaxedPath, bool dumpIR, const char* buildChecksum, const std::vector<Source*>& sources, const std::list<std::list<std::pair<int, int>>>& toFuse, const std::list<std::string>& fused, @@ -334,8 +334,6 @@ bool RSCompilerDriver::buildScriptGroup( Source::CreateFromModule(Context, pOutputFilepath, module, true)); RSScript script(*source); - const char* buildChecksum = "DummyChecksumForScriptGroup"; - // Embed the info string directly in the ELF script.setEmbedInfo(true); script.setOptimizationLevel(RSScript::kOptLvl3); diff --git a/tools/bcc/Main.cpp b/tools/bcc/Main.cpp index 9977876..49f197b 100644 --- a/tools/bcc/Main.cpp +++ b/tools/bcc/Main.cpp @@ -203,7 +203,7 @@ bool compileScriptGroup(BCCContext& Context, RSCompilerDriver& RSCD) { bool success = RSCD.buildScriptGroup( Context, outputFilepath.c_str(), OptBCLibFilename.c_str(), - OptBCLibRelaxedFilename.c_str(), OptEmitLLVM, + OptBCLibRelaxedFilename.c_str(), OptEmitLLVM, OptChecksum.c_str(), sources, sourcesAndSlots, fusedKernelNames, invokeSourcesAndSlots, invokeBatchNames); |