Misc Android-related fixes.

src/common/android/testing/mkdtemp.h

 // Copyright (c) 2012, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 // copyright notice, this list of conditions and the following disclaimer
 // in the documentation and/or other materials provided with the
 // distribution.
 //     * Neither the name of Google Inc. nor the names of its
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-// Android doesn't provide mkdtemp(). Keep this implementation in an
-// C++ anonymous namespace to avoid conflicts on Chromium (which
-// already provides an extern "C" mkdtemp function).
+// mkdtemp() wasn't declared in <stdlib.h> until NDK r9b due to a simple
+// packaging bug (the function has always been implemented in all versions

[Mark Mentovai, 2013/12/13 14:24:28]

Oh, so it’s just a missing declaration?

Is there a macro that has the NDK version?

If so, this header can just detect mkdtemp-declaration-less NDK versions and
provide its own declaration in that case. It can do nothing when building with
an NDK that does declare it.

[digit, 2013/12/13 15:40:19]

Yes, just a missing declaration. There is no macro detailing the NDK revision.

I didn't want to add some auto-detection magic through configure.ac, because
this is only for testing, and we should be able to get rid of it soon.

(I've also tested you could remove this header, and that the tests run when
built with NDK r9b, but this is for a later patch I think).

+// of the C library). This header is provided to build Breakpad with earlier
+// NDK revisions (e.g. the one used by Chromium). It may be removed in the
+// future once all major projects upgrade to use a more recent NDK.
 //
 // The reason this is inlined here is to avoid linking a new object file
 // into each unit test program (i.e. keep build files simple).
 
 #ifndef GOOGLE_BREAKPAD_COMMON_ANDROID_TESTING_MKDTEMP_H
 #define GOOGLE_BREAKPAD_COMMON_ANDROID_TESTING_MKDTEMP_H
 
 #include <assert.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
 
+// Using a macro renaming trick here is necessary when building against
+// NDK r9b. Otherwise the compiler will complain that calls to mkdtemp()
+// are ambiguous.
+#define mkdtemp breakpad_mkdtemp
+
 namespace {
 
-char* mkdtemp(char* path) {
+char* breakpad_mkdtemp(char* path) {
   if (path == NULL) {
     errno = EINVAL;
     return NULL;
   }
 
   // 'path' must be terminated with six 'X'
   const char kSuffix[] = "XXXXXX";
   const size_t kSuffixLen = strlen(kSuffix);
   char* path_end = path + strlen(path);
 
@@ skipping 34 matching lines @@
       return NULL;
   }
 
   assert(errno == EEXIST);
   return NULL;
 }
 
 }  // namespace
 
 #endif  // GOOGLE_BREAKPAD_COMMON_ANDROID_TESTING_MKDTEMP_H