diff options
| -rw-r--r-- | cpp/Android.mk | 1 | ||||
| -rw-r--r-- | cpu_ref/rsCpuScript.cpp | 3 | ||||
| -rw-r--r-- | cpu_ref/rsCpuScriptGroup2.cpp | 7 | ||||
| -rw-r--r-- | rsScriptC.cpp | 3 |
4 files changed, 8 insertions, 6 deletions
diff --git a/cpp/Android.mk b/cpp/Android.mk index f2934f6b..3d3995da 100644 --- a/cpp/Android.mk +++ b/cpp/Android.mk @@ -82,7 +82,6 @@ LOCAL_SRC_FILES := $(rs_cpp_SRC_FILES) LOCAL_SRC_FILES += ../rsCompatibilityLib.cpp LOCAL_WHOLE_STATIC_LIBRARIES := \ - libutils \ libRSDispatch LOCAL_MODULE:= libRScpp_static diff --git a/cpu_ref/rsCpuScript.cpp b/cpu_ref/rsCpuScript.cpp index 582b3424..d9f94121 100644 --- a/cpu_ref/rsCpuScript.cpp +++ b/cpu_ref/rsCpuScript.cpp @@ -382,7 +382,8 @@ bool RsdCpuScriptImpl::init(char const *resName, char const *cacheDir, compileArguments.push_back("-build-checksum"); std::stringstream ss; ss << std::hex << mBuildChecksum; - compileArguments.push_back(ss.str().c_str()); + std::string checksumStr(ss.str()); + compileArguments.push_back(checksumStr.c_str()); compileArguments.push_back(nullptr); if (!is_force_recompile() && !useRSDebugContext) { diff --git a/cpu_ref/rsCpuScriptGroup2.cpp b/cpu_ref/rsCpuScriptGroup2.cpp index c784ce37..2382cd63 100644 --- a/cpu_ref/rsCpuScriptGroup2.cpp +++ b/cpu_ref/rsCpuScriptGroup2.cpp @@ -181,7 +181,8 @@ CpuScriptGroup2Impl::CpuScriptGroup2Impl(RsdCpuReferenceImpl *cpuRefImpl, mBatches.push_back(batch); std::stringstream ss; ss << "Batch" << ++i; - batch = new Batch(this, ss.str().c_str()); + std::string batchStr(ss.str()); + batch = new Batch(this, batchStr.c_str()); } batch->mClosures.push_back(cc); @@ -416,7 +417,7 @@ void CpuScriptGroup2Impl::compile(const char* cacheDir) { std::stringstream ss; ss << std::hex << checksum; - const char* checksumStr = ss.str().c_str(); + std::string checksumStr(ss.str()); //===--------------------------------------------------------------------===// // Try to load a shared lib from code cache matching filename and checksum @@ -466,7 +467,7 @@ void CpuScriptGroup2Impl::compile(const char* cacheDir) { //===--------------------------------------------------------------------===// arguments.push_back("-build-checksum"); - arguments.push_back(checksumStr); + arguments.push_back(checksumStr.c_str()); arguments.push_back(nullptr); bool compiled = rsuExecuteCommand(RsdCpuScriptImpl::BCC_EXE_PATH, diff --git a/rsScriptC.cpp b/rsScriptC.cpp index fb808a6f..b4d364ff 100644 --- a/rsScriptC.cpp +++ b/rsScriptC.cpp @@ -197,7 +197,8 @@ void ScriptC::runForEach(Context *rsc, if (ATRACE_ENABLED()) { ss << "runForEach slot[" << slot << "]"; } - ATRACE_NAME(ss.str().c_str()); + std::string msgStr(ss.str()); + ATRACE_NAME(msgStr.c_str()); if (mRSC->hadFatalError()) return; |