resolved conflicts for merge of b9a4701b to klp-dev
Change-Id: I9f7924c489d36913e130fd5e7617e3a96e65f1a1
diff --git a/lib/Renderscript/RSCompilerDriver.cpp b/lib/Renderscript/RSCompilerDriver.cpp
index ca2073d..253c4f3 100644
--- a/lib/Renderscript/RSCompilerDriver.cpp
+++ b/lib/Renderscript/RSCompilerDriver.cpp
@@ -246,7 +246,8 @@
#endif
// Open the output file for write.
- OutputFile output_file(pOutputPath, FileBase::kTruncate);
+ OutputFile output_file(pOutputPath,
+ FileBase::kTruncate | FileBase::kBinary);
if (output_file.hasError()) {
ALOGE("Unable to open %s for write! (%s)", pOutputPath,