commit eab740276cffc3f762345018a9ab2472ccaa893d
author The Android Automerger <android-build@google.com> Mon Aug 19 06:01:38 2013 -0700
committer The Android Automerger <android-build@google.com> Mon Aug 19 06:01:38 2013 -0700
tree 08212f125a68afb1e7cb2b40e161d10ce5aff180
parent 0784365a38fd5a9c08dd484f9ba549328d4dff97
parent f078c0a5311fa5bb1136e231b174fe21609b22fb

merge in klp-release history after reset to klp-dev

lib/Renderscript/RSCompilerDriver.cpp

diff --git a/lib/Renderscript/RSCompilerDriver.cpp b/lib/Renderscript/RSCompilerDriver.cpp
index d9593c0..ca2073d 100644
--- a/lib/Renderscript/RSCompilerDriver.cpp
+++ b/lib/Renderscript/RSCompilerDriver.cpp
@@ -230,7 +230,12 @@
   }
 
   {
+    // FIXME(srhines): Windows compilation can't use locking like this, but
+    // we also don't need to worry about concurrent writers of the same file.
+#ifndef USE_MINGW
+    //===------------------------------------------------------------------===//
     // Acquire the write lock for writing output object file.
+    //===------------------------------------------------------------------===//
     FileMutex<FileBase::kWriteLock> write_output_mutex(pOutputPath);
 
     if (write_output_mutex.hasError() || !write_output_mutex.lock()) {
@@ -238,6 +243,7 @@
             pOutputPath, write_output_mutex.getErrorMessage().c_str());
       return Compiler::kErrInvalidSource;
     }
+#endif
 
     // Open the output file for write.
     OutputFile output_file(pOutputPath, FileBase::kTruncate);