diff options
| author | Yang Ni <yangni@google.com> | 2015-04-02 17:48:28 -0700 |
|---|---|---|
| committer | Yang Ni <yangni@google.com> | 2015-04-13 15:31:05 -0700 |
| commit | 8b94222cc8ea83c780c98b22dd1921f392a2bcf6 (patch) | |
| tree | 781a5649926b31401cf54047120df71607236959 /cpu_ref | |
| parent | 69b65033152250cb7ad27f452fa7de41114c9f18 (diff) | |
| download | rs-8b94222cc8ea83c780c98b22dd1921f392a2bcf6.tar.gz | |
Added a name to ScriptGroup2
Implemented in the runtime and CPU driver the new script group name.
Code caching is not implemented yet, and to be added in another CL.
Change-Id: I46e351c8412740512f56b7915b14f36183c6eeaf
Diffstat (limited to 'cpu_ref')
| -rw-r--r-- | cpu_ref/rsCpuScriptGroup2.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpu_ref/rsCpuScriptGroup2.cpp b/cpu_ref/rsCpuScriptGroup2.cpp index a202a428..38ddd5df 100644 --- a/cpu_ref/rsCpuScriptGroup2.cpp +++ b/cpu_ref/rsCpuScriptGroup2.cpp @@ -357,7 +357,6 @@ void CpuScriptGroup2Impl::compile(const char* cacheDir) { arguments.size()-1, arguments.data()); if (!compiled) { - unlink(objFilePath.c_str()); return; } @@ -369,9 +368,12 @@ void CpuScriptGroup2Impl::compile(const char* cacheDir) { if (!SharedLibraryUtils::createSharedLibrary(cacheDir, resName)) { ALOGE("Failed to link object file '%s'", resName); + unlink(objFilePath.c_str()); return; } + unlink(objFilePath.c_str()); + mScriptObj = SharedLibraryUtils::loadSharedLibrary(cacheDir, resName); if (mScriptObj == nullptr) { ALOGE("Unable to load '%s'", resName); |